Browse Source

* Dotted filenames for package rtl-unicode

Michaël Van Canneyt 2 years ago
parent
commit
325b3e4d42
41 changed files with 210 additions and 1 deletions
  1. 3 0
      packages/rtl-unicode/namespaced/System.Collations.Buildcollations.pas
  2. 3 0
      packages/rtl-unicode/namespaced/System.Collations.De.pas
  3. 3 0
      packages/rtl-unicode/namespaced/System.Collations.Es.pas
  4. 3 0
      packages/rtl-unicode/namespaced/System.Collations.Fr_ca.pas
  5. 3 0
      packages/rtl-unicode/namespaced/System.Collations.Ja.pas
  6. 3 0
      packages/rtl-unicode/namespaced/System.Collations.Ko.pas
  7. 3 0
      packages/rtl-unicode/namespaced/System.Collations.Ru.pas
  8. 3 0
      packages/rtl-unicode/namespaced/System.Collations.Sv.pas
  9. 3 0
      packages/rtl-unicode/namespaced/System.Collations.Zh.pas
  10. 3 0
      packages/rtl-unicode/namespaced/System.Unicode.Cp895.pas
  11. 3 0
      packages/rtl-unicode/namespaced/System.Unicode.Cp932.pas
  12. 3 0
      packages/rtl-unicode/namespaced/System.Unicode.Cp936.pas
  13. 3 0
      packages/rtl-unicode/namespaced/System.Unicode.Cp949.pas
  14. 3 0
      packages/rtl-unicode/namespaced/System.Unicode.Cp950.pas
  15. 3 0
      packages/rtl-unicode/namespaced/System.Unicode.Cpbuildu.pp
  16. 3 0
      packages/rtl-unicode/namespaced/System.Unicode.Eastasianwidth.pp
  17. 3 0
      packages/rtl-unicode/namespaced/System.Unicode.Freebidi.pp
  18. 3 0
      packages/rtl-unicode/namespaced/System.Unicode.Graphemebreakproperty.pp
  19. 3 0
      packages/rtl-unicode/namespaced/System.Unicode.Unicodeducet.pas
  20. 3 0
      packages/rtl-unicode/namespaced/System.Unicode.Utf8bidi.pp
  21. 24 0
      packages/rtl-unicode/namespaces.lst
  22. 8 0
      packages/rtl-unicode/src/collations/buildcollations.pas
  23. 7 0
      packages/rtl-unicode/src/collations/collation_de.pas
  24. 7 0
      packages/rtl-unicode/src/collations/collation_es.pas
  25. 7 0
      packages/rtl-unicode/src/collations/collation_fr_ca.pas
  26. 7 0
      packages/rtl-unicode/src/collations/collation_ja.pas
  27. 7 0
      packages/rtl-unicode/src/collations/collation_ko.pas
  28. 7 0
      packages/rtl-unicode/src/collations/collation_ru.pas
  29. 7 0
      packages/rtl-unicode/src/collations/collation_sv.pas
  30. 7 0
      packages/rtl-unicode/src/collations/collation_zh.pas
  31. 7 0
      packages/rtl-unicode/src/inc/cp895.pas
  32. 7 0
      packages/rtl-unicode/src/inc/cp932.pas
  33. 7 0
      packages/rtl-unicode/src/inc/cp936.pas
  34. 7 0
      packages/rtl-unicode/src/inc/cp949.pas
  35. 7 0
      packages/rtl-unicode/src/inc/cp950.pas
  36. 7 1
      packages/rtl-unicode/src/inc/cpbuildu.pp
  37. 2 0
      packages/rtl-unicode/src/inc/eastasianwidth.pp
  38. 2 0
      packages/rtl-unicode/src/inc/freebidi.pp
  39. 2 0
      packages/rtl-unicode/src/inc/graphemebreakproperty.pp
  40. 7 0
      packages/rtl-unicode/src/inc/unicodeducet.pas
  41. 7 0
      packages/rtl-unicode/src/inc/utf8bidi.pp

+ 3 - 0
packages/rtl-unicode/namespaced/System.Collations.Buildcollations.pas

@@ -0,0 +1,3 @@
+unit System.Collations.Buildcollations;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i buildcollations.pas}

+ 3 - 0
packages/rtl-unicode/namespaced/System.Collations.De.pas

@@ -0,0 +1,3 @@
+unit System.Collations.De;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i collation_de.pas}

+ 3 - 0
packages/rtl-unicode/namespaced/System.Collations.Es.pas

@@ -0,0 +1,3 @@
+unit System.Collations.Es;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i collation_es.pas}

+ 3 - 0
packages/rtl-unicode/namespaced/System.Collations.Fr_ca.pas

@@ -0,0 +1,3 @@
+unit System.Collations.Fr_ca;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i collation_fr_ca.pas}

+ 3 - 0
packages/rtl-unicode/namespaced/System.Collations.Ja.pas

@@ -0,0 +1,3 @@
+unit System.Collations.Ja;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i collation_ja.pas}

+ 3 - 0
packages/rtl-unicode/namespaced/System.Collations.Ko.pas

@@ -0,0 +1,3 @@
+unit System.Collations.Ko;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i collation_ko.pas}

+ 3 - 0
packages/rtl-unicode/namespaced/System.Collations.Ru.pas

@@ -0,0 +1,3 @@
+unit System.Collations.Ru;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i collation_ru.pas}

+ 3 - 0
packages/rtl-unicode/namespaced/System.Collations.Sv.pas

@@ -0,0 +1,3 @@
+unit System.Collations.Sv;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i collation_sv.pas}

+ 3 - 0
packages/rtl-unicode/namespaced/System.Collations.Zh.pas

@@ -0,0 +1,3 @@
+unit System.Collations.Zh;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i collation_zh.pas}

+ 3 - 0
packages/rtl-unicode/namespaced/System.Unicode.Cp895.pas

@@ -0,0 +1,3 @@
+unit System.Unicode.Cp895;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i cp895.pas}

+ 3 - 0
packages/rtl-unicode/namespaced/System.Unicode.Cp932.pas

@@ -0,0 +1,3 @@
+unit System.Unicode.Cp932;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i cp932.pas}

+ 3 - 0
packages/rtl-unicode/namespaced/System.Unicode.Cp936.pas

@@ -0,0 +1,3 @@
+unit System.Unicode.Cp936;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i cp936.pas}

+ 3 - 0
packages/rtl-unicode/namespaced/System.Unicode.Cp949.pas

@@ -0,0 +1,3 @@
+unit System.Unicode.Cp949;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i cp949.pas}

+ 3 - 0
packages/rtl-unicode/namespaced/System.Unicode.Cp950.pas

@@ -0,0 +1,3 @@
+unit System.Unicode.Cp950;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i cp950.pas}

+ 3 - 0
packages/rtl-unicode/namespaced/System.Unicode.Cpbuildu.pp

@@ -0,0 +1,3 @@
+unit System.Unicode.Cpbuildu;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i cpbuildu.pp}

+ 3 - 0
packages/rtl-unicode/namespaced/System.Unicode.Eastasianwidth.pp

@@ -0,0 +1,3 @@
+unit System.Unicode.Eastasianwidth;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i eastasianwidth.pp}

+ 3 - 0
packages/rtl-unicode/namespaced/System.Unicode.Freebidi.pp

@@ -0,0 +1,3 @@
+unit System.Unicode.Freebidi;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i freebidi.pp}

+ 3 - 0
packages/rtl-unicode/namespaced/System.Unicode.Graphemebreakproperty.pp

@@ -0,0 +1,3 @@
+unit System.Unicode.Graphemebreakproperty;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i graphemebreakproperty.pp}

+ 3 - 0
packages/rtl-unicode/namespaced/System.Unicode.Unicodeducet.pas

@@ -0,0 +1,3 @@
+unit System.Unicode.Unicodeducet;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i unicodeducet.pas}

+ 3 - 0
packages/rtl-unicode/namespaced/System.Unicode.Utf8bidi.pp

@@ -0,0 +1,3 @@
+unit System.Unicode.Utf8bidi;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i utf8bidi.pp}

+ 24 - 0
packages/rtl-unicode/namespaces.lst

@@ -0,0 +1,24 @@
+src/collations/collation_zh.pas=namespaced/System.Collations.Zh.pas
+{s*:src/collations/}=namespaced/
+{i+:src/collations/}
+src/collations/collation_de.pas=namespaced/System.Collations.De.pas
+src/collations/collation_ru.pas=namespaced/System.Collations.Ru.pas
+src/collations/buildcollations.pas=namespaced/System.Collations.Buildcollations.pas
+src/collations/collation_es.pas=namespaced/System.Collations.Es.pas
+src/collations/collation_fr_ca.pas=namespaced/System.Collations.Fr_ca.pas
+src/collations/collation_sv.pas=namespaced/System.Collations.Sv.pas
+src/collations/collation_ja.pas=namespaced/System.Collations.Ja.pas
+src/collations/collation_ko.pas=namespaced/System.Collations.Ko.pas
+src/inc/cpbuildu.pp=namespaced/System.Unicode.Cpbuildu.pp
+{s*:src/inc/}=namespaced/
+{i+:src/inc/}
+src/inc/freebidi.pp=namespaced/System.Unicode.Freebidi.pp
+src/inc/utf8bidi.pp=namespaced/System.Unicode.Utf8bidi.pp
+src/inc/cp932.pas=namespaced/System.Unicode.Cp932.pas
+src/inc/cp949.pas=namespaced/System.Unicode.Cp949.pas
+src/inc/unicodeducet.pas=namespaced/System.Unicode.Unicodeducet.pas
+src/inc/cp936.pas=namespaced/System.Unicode.Cp936.pas
+src/inc/cp895.pas=namespaced/System.Unicode.Cp895.pas
+src/inc/graphemebreakproperty.pp=namespaced/System.Unicode.Graphemebreakproperty.pp
+src/inc/eastasianwidth.pp=namespaced/System.Unicode.Eastasianwidth.pp
+src/inc/cp950.pas=namespaced/System.Unicode.Cp950.pas

+ 8 - 0
packages/rtl-unicode/src/collations/buildcollations.pas

@@ -1,10 +1,18 @@
+{$IFNDEF FPC_DOTTEDUNITS}
 unit buildcollations;
+{$ENDIF FPC_DOTTEDUNITS}
 
   interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+    uses
+      System.Collations.De, System.Collations.Es, System.Collations.Fr_ca, System.Collations.Ja, 
+      System.Collations.Ko, System.Collations.Ru, System.Collations.Sv, System.Collations.Zh;
+{$ELSE FPC_DOTTEDUNITS}
     uses
       collation_de, collation_es, collation_fr_ca, collation_ja, 
       collation_ko, collation_ru, collation_sv, collation_zh;
+{$ENDIF FPC_DOTTEDUNITS}
 
   implementation
 

+ 7 - 0
packages/rtl-unicode/src/collations/collation_de.pas

@@ -32,13 +32,20 @@
   {$DEFINE ENDIAN_LITTLE}
 {$ENDIF !FPC}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit collation_de;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
 implementation
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.CodePages.unicodedata, System.Unicode.Unicodeducet;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   unicodedata, unicodeducet;
+{$ENDIF FPC_DOTTEDUNITS}
 
 const
   UPDATED_FIELDS = [ TCollationField.VariableLowLimit, TCollationField.VariableHighLimit ];

+ 7 - 0
packages/rtl-unicode/src/collations/collation_es.pas

@@ -32,13 +32,20 @@
   {$DEFINE ENDIAN_LITTLE}
 {$ENDIF !FPC}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit collation_es;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
 implementation
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.CodePages.unicodedata, System.Unicode.Unicodeducet;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   unicodedata, unicodeducet;
+{$ENDIF FPC_DOTTEDUNITS}
 
 const
   UPDATED_FIELDS = [  ];

+ 7 - 0
packages/rtl-unicode/src/collations/collation_fr_ca.pas

@@ -32,13 +32,20 @@
   {$DEFINE ENDIAN_LITTLE}
 {$ENDIF !FPC}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit collation_fr_ca;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
 implementation
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.CodePages.unicodedata, System.Unicode.Unicodeducet;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   unicodedata, unicodeducet;
+{$ENDIF FPC_DOTTEDUNITS}
 
 const
   UPDATED_FIELDS = [  ];

+ 7 - 0
packages/rtl-unicode/src/collations/collation_ja.pas

@@ -32,13 +32,20 @@
   {$DEFINE ENDIAN_LITTLE}
 {$ENDIF !FPC}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit collation_ja;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
 implementation
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.CodePages.unicodedata, System.Unicode.Unicodeducet;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   unicodedata, unicodeducet;
+{$ENDIF FPC_DOTTEDUNITS}
 
 const
   UPDATED_FIELDS = [ TCollationField.VariableLowLimit, TCollationField.VariableHighLimit ];

+ 7 - 0
packages/rtl-unicode/src/collations/collation_ko.pas

@@ -32,13 +32,20 @@
   {$DEFINE ENDIAN_LITTLE}
 {$ENDIF !FPC}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit collation_ko;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
 implementation
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.CodePages.unicodedata, System.Unicode.Unicodeducet;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   unicodedata, unicodeducet;
+{$ENDIF FPC_DOTTEDUNITS}
 
 const
   UPDATED_FIELDS = [  ];

+ 7 - 0
packages/rtl-unicode/src/collations/collation_ru.pas

@@ -32,13 +32,20 @@
   {$DEFINE ENDIAN_LITTLE}
 {$ENDIF !FPC}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit collation_ru;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
 implementation
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.CodePages.unicodedata, System.Unicode.Unicodeducet;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   unicodedata, unicodeducet;
+{$ENDIF FPC_DOTTEDUNITS}
 
 const
   UPDATED_FIELDS = [  ];

+ 7 - 0
packages/rtl-unicode/src/collations/collation_sv.pas

@@ -32,13 +32,20 @@
   {$DEFINE ENDIAN_LITTLE}
 {$ENDIF !FPC}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit collation_sv;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
 implementation
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.CodePages.unicodedata, System.Unicode.Unicodeducet;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   unicodedata, unicodeducet;
+{$ENDIF FPC_DOTTEDUNITS}
 
 const
   UPDATED_FIELDS = [  ];

+ 7 - 0
packages/rtl-unicode/src/collations/collation_zh.pas

@@ -32,13 +32,20 @@
   {$DEFINE ENDIAN_LITTLE}
 {$ENDIF !FPC}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit collation_zh;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
 implementation
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.CodePages.unicodedata, System.Unicode.Unicodeducet;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   unicodedata, unicodeducet;
+{$ENDIF FPC_DOTTEDUNITS}
 
 const
   UPDATED_FIELDS = [  ];

+ 7 - 0
packages/rtl-unicode/src/inc/cp895.pas

@@ -1,12 +1,19 @@
 { This is an automatically created file, so don't edit it }
+{$IFNDEF FPC_DOTTEDUNITS}
 unit cp895;
+{$ENDIF FPC_DOTTEDUNITS}
 
   interface
 
   implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+  uses
+     System.CharSet;
+{$ELSE FPC_DOTTEDUNITS}
   uses
      charset;
+{$ENDIF FPC_DOTTEDUNITS}
 
   const
      map : array[0..255] of tunicodecharmapping = (

+ 7 - 0
packages/rtl-unicode/src/inc/cp932.pas

@@ -1,12 +1,19 @@
 { This is an automatically created file, so don't edit it }
+{$IFNDEF FPC_DOTTEDUNITS}
 unit cp932;
+{$ENDIF FPC_DOTTEDUNITS}
 
   interface
 
   implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+  uses
+     System.CharSet;
+{$ELSE FPC_DOTTEDUNITS}
   uses
      charset;
+{$ENDIF FPC_DOTTEDUNITS}
 
   const
      map : array[0..64587] of tunicodecharmapping = (

+ 7 - 0
packages/rtl-unicode/src/inc/cp936.pas

@@ -1,12 +1,19 @@
 { This is an automatically created file, so don't edit it }
+{$IFNDEF FPC_DOTTEDUNITS}
 unit cp936;
+{$ENDIF FPC_DOTTEDUNITS}
 
   interface
 
   implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+  uses
+     System.CharSet;
+{$ELSE FPC_DOTTEDUNITS}
   uses
      charset;
+{$ENDIF FPC_DOTTEDUNITS}
 
   const
      map : array[0..65103] of tunicodecharmapping = (

+ 7 - 0
packages/rtl-unicode/src/inc/cp949.pas

@@ -1,12 +1,19 @@
 { This is an automatically created file, so don't edit it }
+{$IFNDEF FPC_DOTTEDUNITS}
 unit cp949;
+{$ENDIF FPC_DOTTEDUNITS}
 
   interface
 
   implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+  uses
+     System.CharSet;
+{$ELSE FPC_DOTTEDUNITS}
   uses
      charset;
+{$ENDIF FPC_DOTTEDUNITS}
 
   const
      map : array[0..65022] of tunicodecharmapping = (

+ 7 - 0
packages/rtl-unicode/src/inc/cp950.pas

@@ -1,12 +1,19 @@
 { This is an automatically created file, so don't edit it }
+{$IFNDEF FPC_DOTTEDUNITS}
 unit cp950;
+{$ENDIF FPC_DOTTEDUNITS}
 
   interface
 
   implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+  uses
+     System.CharSet;
+{$ELSE FPC_DOTTEDUNITS}
   uses
      charset;
+{$ENDIF FPC_DOTTEDUNITS}
 
   const
      map : array[0..63998] of tunicodecharmapping = (

+ 7 - 1
packages/rtl-unicode/src/inc/cpbuildu.pp

@@ -1,8 +1,14 @@
+{$IFNDEF FPC_DOTTEDUNITS}
 unit cpbuildu;
+{$ENDIF FPC_DOTTEDUNITS}
 // buildunit for cp*
 interface
+{$IFDEF FPC_DOTTEDUNITS}
+uses System.Unicode.Cp895,System.Unicode.Cp932,System.Unicode.Cp936,System.Unicode.Cp949,System.Unicode.Cp950;
+{$ELSE FPC_DOTTEDUNITS}
 uses cp895,cp932,cp936,cp949,cp950;
+{$ENDIF FPC_DOTTEDUNITS}
 
 implementation
 
-end.
+end.

+ 2 - 0
packages/rtl-unicode/src/inc/eastasianwidth.pp

@@ -28,7 +28,9 @@
   Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1335, USA.
 }
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit eastasianwidth;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$MODE objfpc}
 

+ 2 - 0
packages/rtl-unicode/src/inc/freebidi.pp

@@ -2,7 +2,9 @@
 Author Mazen NEIFER
 Licence LGPL
 }
+{$IFNDEF FPC_DOTTEDUNITS}
 unit FreeBIDI;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$mode objfpc}{$H+}
 

+ 2 - 0
packages/rtl-unicode/src/inc/graphemebreakproperty.pp

@@ -28,7 +28,9 @@
   Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1335, USA.
 }
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit graphemebreakproperty;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$MODE objfpc}
 

+ 7 - 0
packages/rtl-unicode/src/inc/unicodeducet.pas

@@ -19,7 +19,9 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 }
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit unicodeducet;
+{$ENDIF FPC_DOTTEDUNITS}
 {$IFDEF FPC}
   {$mode delphi}
   {$H+}
@@ -35,8 +37,13 @@ unit unicodeducet;
 interface
 
 implementation
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.CodePages.unicodedata;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   unicodedata;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$INCLUDE ucadata.inc}
 {$IFDEF ENDIAN_LITTLE}

+ 7 - 0
packages/rtl-unicode/src/inc/utf8bidi.pp

@@ -2,14 +2,21 @@
 Author Mazen NEIFER
 Licence LGPL
 }
+{$IFNDEF FPC_DOTTEDUNITS}
 unit UTF8BIDI;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$mode objfpc}{$H+}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Unicode.Freebidi;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   FreeBIDI;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type
   TUCS32Char = Cardinal;