[FriBidi-commit] fribidi/bin fribidi-benchmark.c, 1.1.1.1, 1.2 fribidi-main.c, 1.2, 1.3

[Behdad Esfahbod]

Update of /cvs/fribidi/fribidi/bin
In directory pdx:/tmp/cvs-serv16180/bin

Modified Files:
	fribidi-benchmark.c fribidi-main.c 
Log Message:
Changed the run data structure from a double-terminated deque, to a
circular deque with a single sentinel.  To debug that, also added some assert
stuff, added function attributes, deprecated old interfaces, and humm, that it
for now.


Index: fribidi-benchmark.c
===================================================================
RCS file: /cvs/fribidi/fribidi/bin/fribidi-benchmark.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- a/fribidi-benchmark.c	25 Apr 2004 18:47:57 -0000	1.1.1.1
+++ b/fribidi-benchmark.c	3 May 2004 22:05:19 -0000	1.2
@@ -33,10 +33,10 @@
  * For licensing issues, contact <license at farsiweb.info>.
  */
 
-#include <fribidi.h>
-
 #include <common.h>
 
+#include <fribidi.h>
+
 #include <stdio.h>
 #if STDC_HEADERS
 # include <stdlib.h>

Index: fribidi-main.c
===================================================================
RCS file: /cvs/fribidi/fribidi/bin/fribidi-main.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- a/fribidi-main.c	28 Apr 2004 03:20:22 -0000	1.2
+++ b/fribidi-main.c	3 May 2004 22:05:19 -0000	1.3
@@ -33,6 +33,8 @@
  * For licensing issues, contact <license at farsiweb.info>.
  */
 
+#include <common.h>
+
 #include <fribidi.h>
 #if !FRIBIDI_CHARSETS
 # if FRIBIDI_MAIN_USE_ICONV_H
@@ -42,8 +44,6 @@
 # endif	/* FRIBIDI_MAIN_USE_ICONV_H */
 #endif /* !FRIBIDI_CHARSETS */
 
-#include <common.h>
-
 #include <stdio.h>
 #if STDC_HEADERS
 # include <stdlib.h>
@@ -254,8 +254,8 @@
 	{"nomirror", 0, &do_mirror, false},
 	{"reordernsm", 0, &do_reorder_nsm, true},
 	{"clean", 0, &do_clean, true},
-	{"ltr", 0, (int *) (void *) &input_base_direction, FRIBIDI_TYPE_L},
-	{"rtl", 0, (int *) (void *) &input_base_direction, FRIBIDI_TYPE_R},
+	{"ltr", 0, (int *) (void *) &input_base_direction, FRIBIDI_TYPE_LTR},
+	{"rtl", 0, (int *) (void *) &input_base_direction, FRIBIDI_TYPE_RTL},
 	{"wltr", 0, (int *) (void *) &input_base_direction, FRIBIDI_TYPE_WL},
 	{"wrtl", 0, (int *) (void *) &input_base_direction, FRIBIDI_TYPE_WR},
 	{"basedir", 0, &show_basedir, true},
@@ -481,9 +481,9 @@
 			      while (wid > 0 && idx < len)
 				{
 				  wid -=
-				    fribidi_get_type (visual[idx]) &
-				    (FRIBIDI_MASK_BN | FRIBIDI_MASK_NSM) ? 0 :
-				    1;
+				    FRIBIDI_IS_EXPLICIT_OR_BN_OR_NSM
+				    (fribidi_get_bidi_type (visual[idx])) ? 0
+				    : 1;
 				  idx++;
 				}
 #if !FRIBIDI_MAIN_USE_ICONV_H