4 files changed, 62 insertions, 55 deletions
diff --git a/test/cdtest/cdtest.c b/test/cdtest/cdtest.c
index 82cc812..f5aa9f4 100644
--- a/test/cdtest/cdtest.c
+++ b/test/cdtest/cdtest.c
@@ -24,7 +24,6 @@
 #include <cdpicture.h>
 #include <cddbuf.h>
 #include <cdirgb.h>
-#include <cdgdiplus.h>
 #include <iupkey.h>
 
 #include "cdtest.h"
@@ -232,7 +231,7 @@ void CDTestInit(void)
   if (use_gdiplus) 
   {
 #ifdef USE_GDIPLUS
-    cdInitGdiPlus();
+    cdInitContextPlus();
 #endif
   }
 
diff --git a/test/mf/align.mf b/test/mf/align.mf
index 110ac39..dfde3bb 100644
--- a/test/mf/align.mf
+++ b/test/mf/align.mf
@@ -1,45 +1,47 @@
 CDMF 383 410
 27 255 255 255
-28 0 0 0
+28 0 255 255
 13 1
 14 0
 15 0
-16 1
+16 0
 18 0
 17 0
-21 0 0 12
-23 9
 33 0
 24 1
 25 10
 1
 25 5
-27 0 255 255
+28 0 0 255
 12 151 328
-21 2 0 10
-8 151 329 TMWjfgoiuá
+21 2 0 12
+23 9
+8 151 329 Base Left
 23 10
-8 150 328 TMWjfgoiuá
+8 150 328 Base Center
 23 11
-8 151 327 TMWjfgoiuá
+8 151 327 Base Right
+28 255 0 0
 12 151 253
 23 0
-8 151 253 TMWjfgoiuá
+8 151 253 North
 23 1
-8 151 252 TMWjfgoiuá
+8 151 252 South
 23 2
-8 150 254 TMWjfgoiuá
+8 150 254 East
 23 3
-8 152 255 TMWjfgoiuá
+8 152 255 West
+28 0 255 0
 12 285 335
 23 8
-8 285 336 TMWjfgoiuá
+8 285 336 Center
+28 0 255 255
 12 150 151
 23 4
-8 151 151 TMWjfgoiuá
+8 151 151 North East
 23 5
-8 150 151 TMWjfgoiuá
+8 150 151 North West
 23 6
-8 149 152 TMWjfgoiuá
+8 149 152 South East
 23 7
-8 149 152 TMWjfgoiuá
+8 149 152 South West
diff --git a/test/mf/alignorient.mf b/test/mf/alignorient.mf
index dbaa907..92784ac 100644
--- a/test/mf/alignorient.mf
+++ b/test/mf/alignorient.mf
@@ -2,43 +2,46 @@ CDMF 383 410
 27 255 255 255
 28 0 255 255
 13 1
-14 1
+14 0
 15 0
-16 1
+16 0
 18 0
 17 0
-21 0 0 12
-23 9
 33 60
 24 1
 25 10
 1
 25 5
+28 0 0 255
 12 151 328
-21 2 0 24
-8 151 329 Text
+21 2 0 12
+23 9
+8 151 329 Base Left
 23 10
-8 150 328 Text
+8 150 328 Base Center
 23 11
-8 151 327 Text
+8 151 327 Base Right
+28 255 0 0
 12 151 253
 23 0
-8 151 253 Text
+8 151 253 North
 23 1
-8 151 252 Text
+8 151 252 South
 23 2
-8 150 254 Text
+8 150 254 East
 23 3
-8 152 255 Text
+8 152 255 West
+28 0 255 0
 12 285 335
 23 8
-8 285 336 Text
+8 285 336 Center
+28 0 255 255
 12 150 151
 23 4
-8 151 151 Text
+8 151 151 North East
 23 5
-8 150 151 Text
+8 150 151 North West
 23 6
-8 149 152 Text
+8 149 152 South East
 23 7
-8 149 152 Text
+8 149 152 South West
diff --git a/test/mf/alignxor.mf b/test/mf/alignxor.mf
index 0b7f25d..1335245 100644
--- a/test/mf/alignxor.mf
+++ b/test/mf/alignxor.mf
@@ -1,44 +1,47 @@
 CDMF 383 410
 27 255 255 255
 28 0 255 255
-13 0
+13 1
 14 1
 15 0
-16 1
+16 0
 18 0
 17 0
-21 0 0 12
-23 9
-33 0
+33 60
 24 1
 25 10
 1
 25 5
+28 0 0 255
 12 151 328
-21 2 0 24
-8 151 329 Text
+21 2 0 12
+23 9
+8 151 329 Base Left
 23 10
-8 150 328 Text
+8 150 328 Base Center
 23 11
-8 151 327 Text
+8 151 327 Base Right
+28 255 0 0
 12 151 253
 23 0
-8 151 253 Text
+8 151 253 North
 23 1
-8 151 252 Text
+8 151 252 South
 23 2
-8 150 254 Text
+8 150 254 East
 23 3
-8 152 255 Text
+8 152 255 West
+28 0 255 0
 12 285 335
 23 8
-8 285 336 Text
+8 285 336 Center
+28 0 255 255
 12 150 151
 23 4
-8 151 151 Text
+8 151 151 North East
 23 5
-8 150 151 Text
+8 150 151 North West
 23 6
-8 149 152 Text
+8 149 152 South East
 23 7
-8 149 152 Text
+8 149 152 South West