* Compile in unicodertl

packages/fcl-syntax/src/syntax.bash.pp

@@ -21,7 +21,7 @@ unit syntax.bash;
 interface
 
 uses
-  types, syntax.highlighter;
+  {$IFDEF FPC_DOTTEDUNITS}System.{$ENDIF}Types, syntax.highlighter;
 
 type
 

packages/fcl-syntax/src/syntax.css.pp

@@ -21,7 +21,11 @@ unit syntax.css;
 interface
 
 uses
-  types, syntax.highlighter;
+  {$IFDEF FPC_DOTTEDUNITS}
+  System.Types, System.SysUtils, syntax.highlighter;
+  {$ELSE}
+  Types, SysUtils, syntax.highlighter;
+  {$ENDIF}
 
 type
 
@@ -73,9 +77,6 @@ function DoCssHighlighting(const Source: string): TSyntaxTokenArray;
 
 implementation
 
-uses
-  SysUtils;
-
   { TCssSyntaxHighlighter }
 
 

packages/fcl-syntax/src/syntax.highlighter.pp

@@ -22,7 +22,11 @@ unit syntax.highlighter;
 interface
 
 uses
+{$IFDEF FPC_DOTTEDUNITS}
+  System.Types, System.Classes, System.SysUtils, System.Contnrs;
+{$ELSE}
   Types, Classes, SysUtils, contnrs;
+{$ENDIF}
 
 type
   ESyntaxHighlighter = class(Exception);

packages/fcl-syntax/src/syntax.html.pp

@@ -21,7 +21,11 @@ unit syntax.html;
 interface
 
 uses
-  types, syntax.highlighter, syntax.css, syntax.javascript;
+  {$IFDEF FPC_DOTTEDUNITS}
+  System.Types, System.SysUtils, syntax.highlighter, syntax.css, syntax.javascript;
+  {$ELSE}
+  Types, SysUtils, syntax.highlighter, syntax.css, syntax.javascript;
+  {$ENDIF}
 
 type
   THtmlParseState = (
@@ -94,8 +98,6 @@ function DoHtmlHighlighting(const source: string): TSyntaxTokenArray;
 
 implementation
 
-uses SysUtils;
-
 { THtmlSyntaxHighlighter }
 
 constructor THtmlSyntaxHighlighter.Create;

packages/fcl-syntax/src/syntax.htmlrender.pp

@@ -20,7 +20,11 @@ unit syntax.htmlrender;
 interface
 
 uses
+{$IFDEF FPC_DOTTEDUNITS}
+  System.Classes, System.SysUtils, syntax.highlighter;
+{$ELSE}  
   Classes, SysUtils, syntax.highlighter;
+{$ENDIF}
 
 type
   THTMLRenderOption = (hroNoDefaultSpan, hroPreserveLineStructure);

packages/fcl-syntax/src/syntax.ini.pp

@@ -21,7 +21,11 @@ unit syntax.ini;
 interface
 
 uses
-  types, syntax.highlighter;
+  {$IFDEF FPC_DOTTEDUNITS}
+  System.Types, System.SysUtils, syntax.highlighter;
+  {$ELSE}
+  Types, SysUtils, syntax.highlighter;
+  {$ENDIF}
 
 type
 
@@ -52,9 +56,6 @@ function DoIniHighlighting(const Source: string): TSyntaxTokenArray;
 
 implementation
 
-uses
-  SysUtils;
-
 { TIniSyntaxHighlighter }
 
 procedure TIniSyntaxHighlighter.ProcessSection(var endPos: integer);

packages/fcl-syntax/src/syntax.javascript.pp

@@ -22,7 +22,11 @@ unit syntax.javascript;
 interface
 
 uses
-  types, syntax.highlighter;
+  {$IFDEF FPC_DOTTEDUNITS}
+  System.Types, System.SysUtils, syntax.highlighter;
+  {$ELSE}
+  Types, SysUtils, syntax.highlighter;
+  {$ENDIF}
 
 type
 
@@ -86,9 +90,6 @@ function DoJavaScriptHighlighting(const Source: string): TSyntaxTokenArray;
 
 implementation
 
-uses
-  SysUtils;
-
   { TJavaScriptSyntaxHighlighter }
 
 

packages/fcl-syntax/src/syntax.json.pp

@@ -21,7 +21,11 @@ unit syntax.json;
 interface
 
 uses
-  types, syntax.highlighter;
+  {$IFDEF FPC_DOTTEDUNITS}
+  System.Types, System.SysUtils, syntax.highlighter;
+  {$ELSE}
+  Types, SysUtils, syntax.highlighter;
+  {$ENDIF}
 
 type
 
@@ -53,9 +57,6 @@ function DoJsonHighlighting(const Source: string): TSyntaxTokenArray;
 
 implementation
 
-uses
-  SysUtils;
-
 { TJsonSyntaxHighlighter }
 
 procedure TJsonSyntaxHighlighter.ProcessString(var endPos: integer; isKey: boolean);

packages/fcl-syntax/src/syntax.pascal.pp

@@ -20,7 +20,11 @@ unit syntax.pascal;
 interface
 
 uses
+  {$IFDEF FPC_DOTTEDUNITS}
+  System.Types, System.SysUtils, syntax.highlighter;
+  {$ELSE}
   types, sysutils, syntax.highlighter;
+  {$ENDIF}
 
 type
 

packages/fcl-syntax/src/syntax.sql.pp

@@ -21,7 +21,11 @@ unit syntax.sql;
 interface
 
 uses
-  types, syntax.highlighter;
+  {$IFDEF FPC_DOTTEDUNITS}
+  System.Types, System.SysUtils, syntax.highlighter;
+  {$ELSE}
+  types, sysutils, syntax.highlighter;
+  {$ENDIF}
 
 type
   // String escaping modes for SQL
@@ -95,9 +99,6 @@ function DoSqlHighlighting(const Source: string; EscapeMode: TSqlStringEscapeMod
 
 implementation
 
-uses
-  SysUtils;
-
 { TSqlSyntaxHighlighter }
 
 procedure TSqlSyntaxHighlighter.ProcessSingleQuoteString(var endPos: integer);