Mon Jun 14 11:43:56 PDT 2004

Update of /cvs/fribidi/fribidi/lib
In directory pdx:/tmp/cvs-serv29670/lib

Modified Files:
	Headers.mk Makefile.am fribidi-bidi-types.c 
	fribidi-bidi-types.h fribidi-bidi.c fribidi-bidi.h 
	fribidi-config.h.in fribidi-joining-types.c 
	fribidi-joining-types.h fribidi-mirroring.c 
	fribidi-mirroring.h fribidi-run.c fribidi.c fribidi.def 
	fribidi.h 
Removed Files:
	fribidi-bidi-type.c fribidi-bidi-type.h fribidi-joining-type.c 
	fribidi-joining-type.h 
Log Message:
fribidi-bidi-type.[ch] merged into fribidi-bidi-types.[ch].
fribidi-joining-type.[ch] merged into fribidi-joining-types.[ch].


Index: Headers.mk
===================================================================
RCS file: /cvs/fribidi/fribidi/lib/Headers.mk,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7

--- Headers.mk	13 Jun 2004 20:11:42 -0000	1.6
+++ Headers.mk	14 Jun 2004 18:43:53 -0000	1.7
@@ -1,14 +1,12 @@
 libfribidi_la_headers = \
 		fribidi-begindecls.h \
 		fribidi-bidi.h \
-		fribidi-bidi-type.h \
 		fribidi-bidi-types.h \
 		fribidi-bidi-types-list.h \
 		fribidi-common.h \
 		fribidi-enddecls.h \
 		fribidi-env.h \
 		fribidi-joining.h \
-		fribidi-joining-type.h \
 		fribidi-joining-types.h \
 		fribidi-joining-types-list.h \
 		fribidi-mirroring.h \
@@ -16,5 +14,6 @@
 		fribidi-unicode.h \
 		fribidi-unicode-version.h \
 		fribidi.h
+# fribidi.h should be the last entry in the list above.
 
 libfribidi_la_symbols = $(shell cat $(top_srcdir)/lib/fribidi.def)

Index: Makefile.am
===================================================================
RCS file: /cvs/fribidi/fribidi/lib/Makefile.am,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- Makefile.am	13 Jun 2004 20:11:42 -0000	1.10
+++ Makefile.am	14 Jun 2004 18:43:53 -0000	1.11
@@ -38,11 +38,9 @@
 		env.h \
 		fribidi.c \
 		fribidi-bidi.c \
-		fribidi-bidi-type.c \
 		fribidi-bidi-types.c \
 		fribidi-env.c \
 		fribidi-joining.c \
-		fribidi-joining-type.c \
 		fribidi-joining-types.c \
 		fribidi-mem.c \
 		fribidi-mirroring.c \

--- fribidi-bidi-type.c DELETED ---

--- fribidi-bidi-type.h DELETED ---

Index: fribidi-bidi-types.c
===================================================================
RCS file: /cvs/fribidi/fribidi/lib/fribidi-bidi-types.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- fribidi-bidi-types.c	13 Jun 2004 20:11:42 -0000	1.6
+++ fribidi-bidi-types.c	14 Jun 2004 18:43:53 -0000	1.7
@@ -37,46 +37,89 @@
 
 #include "bidi-types.h"
 
-#ifdef DEBUG
+enum FriBidiCharTypeLinearEnum
+{
+# define _FRIBIDI_ADD_TYPE(TYPE,SYMBOL) TYPE,
+# include "fribidi-bidi-types-list.h"
+# undef _FRIBIDI_ADD_TYPE
+  _FRIBIDI_NUM_TYPES
+};
 
-char
-fribidi_char_from_bidi_type (
+#include "bidi-type.tab.i"
+
+/* Map FriBidiCharTypeLinearEnum to FriBidiCharType. */
+static const FriBidiCharType linear_enum_to_char_type[] = {
+# define _FRIBIDI_ADD_TYPE(TYPE,SYMBOL) FRIBIDI_TYPE_##TYPE,
+# include "fribidi-bidi-types-list.h"
+# undef _FRIBIDI_ADD_TYPE
+};
+
+FRIBIDI_ENTRY FriBidiCharType
+fribidi_get_bidi_type (
+  /* input */
+  FriBidiChar ch
+)
+{
+  return linear_enum_to_char_type[FRIBIDI_GET_BIDI_TYPE (ch)];
+}
+
+FRIBIDI_ENTRY void
+fribidi_get_bidi_types (
+  /* input */
+  const FriBidiChar *str,
+  const FriBidiStrIndex len,
+  /* output */
+  FriBidiCharType *type
+)
+{
+  register FriBidiStrIndex i = len;
+  for (; i; i--)
+    {
+      *type++ = linear_enum_to_char_type[FRIBIDI_GET_BIDI_TYPE (*str)];
+      str++;
+    }
+}
+
+FRIBIDI_ENTRY const char *
+fribidi_bidi_type_name (
   /* input */
   FriBidiCharType t
 )
 {
   switch (t)
     {
-#   define _FRIBIDI_ADD_TYPE(TYPE,SYMBOL) case FRIBIDI_TYPE_##TYPE: return SYMBOL;
+#   define _FRIBIDI_ADD_TYPE(TYPE,SYMBOL) case FRIBIDI_TYPE_##TYPE: return STRINGIZE(TYPE);
 #   define _FRIBIDI_ALL_TYPES
 #   include "fribidi-bidi-types-list.h"
 #   undef _FRIBIDI_ALL_TYPES
 #   undef _FRIBIDI_ADD_TYPE
     default:
-      return '?';
+      return "?";
     }
 }
 
-#endif
+#ifdef DEBUG
 
-FRIBIDI_ENTRY const char *
-fribidi_bidi_type_name (
+char
+fribidi_char_from_bidi_type (
   /* input */
   FriBidiCharType t
 )
 {
   switch (t)
     {
-#   define _FRIBIDI_ADD_TYPE(TYPE,SYMBOL) case FRIBIDI_TYPE_##TYPE: return STRINGIZE(TYPE);
+#   define _FRIBIDI_ADD_TYPE(TYPE,SYMBOL) case FRIBIDI_TYPE_##TYPE: return SYMBOL;
 #   define _FRIBIDI_ALL_TYPES
 #   include "fribidi-bidi-types-list.h"
 #   undef _FRIBIDI_ALL_TYPES
 #   undef _FRIBIDI_ADD_TYPE
     default:
-      return "?";
+      return '?';
     }
 }
 
+#endif /* DEBUG */
+
 /* Editor directions:
  * vim:textwidth=78:tabstop=8:shiftwidth=2:autoindent:cindent
  */

Index: fribidi-bidi-types.h
===================================================================
RCS file: /cvs/fribidi/fribidi/lib/fribidi-bidi-types.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- fribidi-bidi-types.h	13 Jun 2004 20:11:42 -0000	1.8
+++ fribidi-bidi-types.h	14 Jun 2004 18:43:53 -0000	1.9
@@ -329,14 +329,38 @@
 
 /* Functions finally */
 
+
+#define fribidi_get_bidi_type FRIBIDI_NAMESPACE(get_bidi_type)
+/* fribidi_get_bidi_type - get character bidi type
+ *
+ * This function returns the bidi type of a character.  There are a few macros
+ * defined in fribidi-bidi-types.h for querying a bidi type.
+ */
+FRIBIDI_ENTRY FriBidiCharType
+fribidi_get_bidi_type (
+  FriBidiChar ch		/* input character */
+) FRIBIDI_GNUC_CONST;
+
+#define fribidi_get_bidi_types FRIBIDI_NAMESPACE(get_bidi_types)
+/* fribidi_get_bidi_types - get bidi types for an string of characters
+ *
+ * This function finds the bidi types of an string of characters.  See
+ * fribidi_get_bidi_type for more information about the bidi types returned
+ * by this function.
+ */
+     FRIBIDI_ENTRY void fribidi_get_bidi_types (
+  const FriBidiChar *str,	/* input string */
+  const FriBidiStrIndex len,	/* input string length */
+  FriBidiCharType *type		/* output bidi types */
+);
+
 #define fribidi_bidi_type_name FRIBIDI_NAMESPACE(bidi_type_name)
 /* fribidi_bidi_type_name - get bidi type name
  *
  * This function returns the bidi type name of a character type.  The
  * returned string is a static string and should not be freed.
  */
-FRIBIDI_ENTRY const char *
-fribidi_bidi_type_name (
+     FRIBIDI_ENTRY const char *fribidi_bidi_type_name (
   FriBidiCharType t		/* input bidi type */
 ) FRIBIDI_GNUC_CONST;
 

Index: fribidi-bidi.c
===================================================================
RCS file: /cvs/fribidi/fribidi/lib/fribidi-bidi.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- fribidi-bidi.c	14 Jun 2004 17:00:33 -0000	1.11
+++ fribidi-bidi.c	14 Jun 2004 18:43:53 -0000	1.12
@@ -36,7 +36,7 @@
 #include "common.h"
 
 #include <fribidi-bidi.h>
-#include <fribidi-bidi-type.h>
+#include <fribidi-bidi-types.h>
 #include <fribidi-mirroring.h>
 #include <fribidi-unicode.h>
 #include <fribidi-env.h>
@@ -206,8 +206,8 @@
 
   MSG ("  Org. types : ");
   if (bidi_types)
-  for (i = 0; i < len; i++)
-    MSG2 ("%c", fribidi_char_from_bidi_type (BIDI_TYPE(i)));
+    for (i = 0; i < len; i++)
+      MSG2 ("%c", fribidi_char_from_bidi_type (BIDI_TYPE (i)));
   MSG ("\n");
 }
 #endif /* DEBUG */
@@ -742,9 +742,9 @@
       {
 	/* if state is on at the very first of the string, do this too. */
 	if (j >= 0)
-	{
-	  char_type = BIDI_TYPE(j);
-	}
+	  {
+	    char_type = BIDI_TYPE (j);
+	  }
 	else
 	  char_type = FRIBIDI_TYPE_ON;
 	if (!state && FRIBIDI_IS_SEPARATOR (char_type))
@@ -810,34 +810,6 @@
 }
 
 
-FRIBIDI_ENTRY void
-fribidi_shape_mirroring (
-  /* input */
-  const FriBidiLevel *embedding_level_list,
-  const FriBidiStrIndex len,
-  /* input and output */
-  FriBidiChar *str
-)
-{
-  register FriBidiStrIndex i;
-
-  fribidi_assert (embedding_level_list);
-
-  if UNLIKELY
-    (len == 0 || !str) return;
-
-  /* L4. Mirror all characters that are in odd levels and have mirrors. */
-  for (i = len - 1; i >= 0; i--)
-    if (FRIBIDI_LEVEL_IS_RTL (embedding_level_list[i]))
-      {
-	FriBidiChar mirrored_ch;
-
-	if (fribidi_get_mirror_char (str[i], &mirrored_ch))
-	  str[i] = mirrored_ch;
-      }
-}
-
-
 static void
 bidi_string_reverse (
   FriBidiChar *str,
@@ -945,7 +917,7 @@
 	  /* L3. Reorder NSMs. */
 	  for (i = off + len - 1; i >= off; i--)
 	    if (FRIBIDI_LEVEL_IS_RTL (embedding_level_list[i])
-		&& BIDI_TYPE(i) == FRIBIDI_TYPE_NSM)
+		&& BIDI_TYPE (i) == FRIBIDI_TYPE_NSM)
 	      {
 		register FriBidiStrIndex seq_end = i;
 		level = embedding_level_list[i];

Index: fribidi-bidi.h
===================================================================
RCS file: /cvs/fribidi/fribidi/lib/fribidi-bidi.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- fribidi-bidi.h	14 Jun 2004 17:00:33 -0000	1.8
+++ fribidi-bidi.h	14 Jun 2004 18:43:53 -0000	1.9
@@ -61,27 +61,12 @@
 fribidi_get_par_embedding_levels (
   const FriBidiChar *str,	/* input paragraph string */
   const FriBidiStrIndex len,	/* input string length of the paragraph */
-  const FriBidiCharType *bidi_types, /* input bidi types */
+  const FriBidiCharType *bidi_types,	/* input bidi types */
   FriBidiParType *pbase_dir,	/* requested and resolved paragraph
 				 * base direction */
   FriBidiLevel *embedding_level_list	/* output list of embedding levels */
 ) FRIBIDI_GNUC_WARN_UNUSED;
 
-#define fribidi_shape_mirroring FRIBIDI_NAMESPACE(shape_mirroring)
-/* fribidi_shape - do mirroring shaping
- *
- * This functions replaces mirroring characters on right-to-left embeddings in
- * string str with their mirrored equivalent as returned by
- * fribidi_get_mirror_char().
- */
-     FRIBIDI_ENTRY void fribidi_shape_mirroring (
-  const FriBidiLevel *embedding_level_list,	/* input list of embedding
-						   levels, as returned by
-						   fribidi_get_par_embedding_levels */
-  const FriBidiStrIndex len,	/* input string length */
-  FriBidiChar *str		/* string to shape */
-);
-
 #define fribidi_reorder_line FRIBIDI_NAMESPACE(reorder_line)
 /* fribidi_reorder_line - reorder a line of logical string to visual
  *
@@ -106,8 +91,8 @@
  */
      FRIBIDI_ENTRY FriBidiLevel fribidi_reorder_line (
   const FriBidiLevel *embedding_level_list,	/* input list of embedding levels,
-					   as returned by
-					   fribidi_get_par_embedding_levels */
+						   as returned by
+						   fribidi_get_par_embedding_levels */
   const FriBidiStrIndex len,	/* input length of the line */
   const FriBidiStrIndex off,	/* input offset of the beginning of the line
 				   in the paragraph */

Index: fribidi-config.h.in
===================================================================
RCS file: /cvs/fribidi/fribidi/lib/fribidi-config.h.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- fribidi-config.h.in	4 Jun 2004 09:41:11 -0000	1.3
+++ fribidi-config.h.in	14 Jun 2004 18:43:53 -0000	1.4
@@ -14,6 +14,9 @@
 #define FRIBIDI_INTERFACE_VERSION @FRIBIDI_INTERFACE_VERSION@
 #define FRIBIDI_INTERFACE_VERSION_STRING "@FRIBIDI_INTERFACE_VERSION@"
 
+/* Define to 1 if you don't want Arabic joining/shaping code in the library */
+#define FRIBIDI_NO_ARABIC @FRIBIDI_NO_ARABIC@
+
 /* Define to 1 if you want charset conversion codes in the library */
 #define FRIBIDI_CHARSETS @FRIBIDI_CHARSETS@
 

--- fribidi-joining-type.c DELETED ---

--- fribidi-joining-type.h DELETED ---

Index: fribidi-joining-types.c
===================================================================
RCS file: /cvs/fribidi/fribidi/lib/fribidi-joining-types.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- fribidi-joining-types.c	13 Jun 2004 20:11:42 -0000	1.1
+++ fribidi-joining-types.c	14 Jun 2004 18:43:53 -0000	1.2
@@ -33,46 +33,86 @@
 
 #include "common.h"
 
+#if !FRIBIDI_NO_ARABIC
+
 #include <fribidi-joining-types.h>
 
 #include "joining-types.h"
 
-#ifdef DEBUG
+enum FriBidiJoiningTypeShortEnum
+{
+# define _FRIBIDI_ADD_TYPE(TYPE,SYMBOL) TYPE = FRIBIDI_JOINING_TYPE_##TYPE,
+# include "fribidi-joining-types-list.h"
+# undef _FRIBIDI_ADD_TYPE
+  _FRIBIDI_NUM_TYPES
+};
 
-char
-fribidi_char_from_joining_type (
+#include "joining-type.tab.i"
+
+FRIBIDI_ENTRY FriBidiJoiningType
+fribidi_get_joining_type (
+  /* input */
+  FriBidiChar ch
+)
+{
+  return FRIBIDI_GET_JOINING_TYPE (ch);
+}
+
+FRIBIDI_ENTRY void
+fribidi_get_joining_types (
+  /* input */
+  const FriBidiChar *str,
+  const FriBidiStrIndex len,
+  /* output */
+  FriBidiJoiningType *type
+)
+{
+  register FriBidiStrIndex i = len;
+  for (; i; i--)
+    {
+      *type++ = FRIBIDI_GET_JOINING_TYPE (*str);
+      str++;
+    }
+}
+
+FRIBIDI_ENTRY const char *
+fribidi_joining_type_name (
   /* input */
   FriBidiJoiningType j
 )
 {
   switch (j)
     {
-#   define _FRIBIDI_ADD_TYPE(TYPE,SYMBOL) case FRIBIDI_JOINING_TYPE_##TYPE: return SYMBOL;
+#   define _FRIBIDI_ADD_TYPE(TYPE,SYMBOL) case FRIBIDI_JOINING_TYPE_##TYPE: return STRINGIZE(TYPE);
 #   include "fribidi-joining-types-list.h"
 #   undef _FRIBIDI_ADD_TYPE
     default:
-      return '?';
+      return "?";
     }
 }
 
-#endif
+#ifdef DEBUG
 
-FRIBIDI_ENTRY const char *
-fribidi_joining_type_name (
+char
+fribidi_char_from_joining_type (
   /* input */
   FriBidiJoiningType j
 )
 {
   switch (j)
     {
-#   define _FRIBIDI_ADD_TYPE(TYPE,SYMBOL) case FRIBIDI_JOINING_TYPE_##TYPE: return STRINGIZE(TYPE);
+#   define _FRIBIDI_ADD_TYPE(TYPE,SYMBOL) case FRIBIDI_JOINING_TYPE_##TYPE: return SYMBOL;
 #   include "fribidi-joining-types-list.h"
 #   undef _FRIBIDI_ADD_TYPE
     default:
-      return "?";
+      return '?';
     }
 }
 
+#endif /* DEBUG */
+
+#endif /* !FRIBIDI_NO_ARABIC */
+
 /* Editor directions:
  * vim:textwidth=78:tabstop=8:shiftwidth=2:autoindent:cindent
  */

Index: fribidi-joining-types.h
===================================================================
RCS file: /cvs/fribidi/fribidi/lib/fribidi-joining-types.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- fribidi-joining-types.h	13 Jun 2004 20:11:42 -0000	1.1
+++ fribidi-joining-types.h	14 Jun 2004 18:43:53 -0000	1.2
@@ -124,14 +124,40 @@
 	((p) & (FRIBIDI_MASK_TRANSPARENT | FRIBIDI_MASK_IGNORED))
 
 
+/* Functions finally */
+
+
+#define fribidi_get_joining_type FRIBIDI_NAMESPACE(get_joining_type)
+/* fribidi_get_joining_type - get character joining type
+ *
+ * This function returns the joining type of a character.  There are a few
+ * macros defined in fribidi-joining-types.h for querying a joining type.
+ */
+FRIBIDI_ENTRY FriBidiJoiningType
+fribidi_get_joining_type (
+  FriBidiChar ch		/* input character */
+) FRIBIDI_GNUC_CONST;
+
+#define fribidi_get_joining_types FRIBIDI_NAMESPACE(get_joining_types)
+/* fribidi_get_joining_types - get joining types for an string of characters
+ *
+ * This function finds the joining types of an string of characters.  See
+ * fribidi_get_joining_type for more information about the joining types
+ * returned by this function.
+ */
+     FRIBIDI_ENTRY void fribidi_get_joining_types (
+  const FriBidiChar *str,	/* input string */
+  const FriBidiStrIndex len,	/* input string length */
+  FriBidiJoiningType *type	/* output bidi types */
+);
+
 #define fribidi_joining_type_name FRIBIDI_NAMESPACE(joining_type_name)
 /* fribidi_joining_type_name - get joining type name
  *
  * This function returns the joining type name of a joining type.  The
  * returned string is a static string and should not be freed.
  */
-FRIBIDI_ENTRY const char *
-fribidi_joining_type_name (
+     FRIBIDI_ENTRY const char *fribidi_joining_type_name (
   FriBidiJoiningType j		/* input joining type */
 ) FRIBIDI_GNUC_CONST;
 

Index: fribidi-mirroring.c
===================================================================
RCS file: /cvs/fribidi/fribidi/lib/fribidi-mirroring.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- fribidi-mirroring.c	13 Jun 2004 20:11:42 -0000	1.11
+++ fribidi-mirroring.c	14 Jun 2004 18:43:53 -0000	1.12
@@ -55,6 +55,34 @@
   return ch != result ? true : false;
 }
 
+
+FRIBIDI_ENTRY void
+fribidi_shape_mirroring (
+  /* input */
+  const FriBidiLevel *embedding_level_list,
+  const FriBidiStrIndex len,
+  /* input and output */
+  FriBidiChar *str
+)
+{
+  register FriBidiStrIndex i;
+
+  fribidi_assert (embedding_level_list);
+
+  if UNLIKELY
+    (len == 0 || !str) return;
+
+  /* L4. Mirror all characters that are in odd levels and have mirrors. */
+  for (i = len - 1; i >= 0; i--)
+    if (FRIBIDI_LEVEL_IS_RTL (embedding_level_list[i]))
+      {
+	FriBidiChar mirrored_ch;
+
+	if (fribidi_get_mirror_char (str[i], &mirrored_ch))
+	  str[i] = mirrored_ch;
+      }
+}
+
 /* Editor directions:
  * Local Variables:
  *   mode: c

Index: fribidi-mirroring.h
===================================================================
RCS file: /cvs/fribidi/fribidi/lib/fribidi-mirroring.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- fribidi-mirroring.h	9 Jun 2004 14:59:21 -0000	1.7
+++ fribidi-mirroring.h	14 Jun 2004 18:43:53 -0000	1.8
@@ -39,6 +39,7 @@
 #include "fribidi-common.h"
 
 #include "fribidi-types.h"
+#include "fribidi-bidi-types.h"
 
 #include "fribidi-begindecls.h"
 
@@ -57,6 +58,21 @@
   FriBidiChar *mirrored_ch	/* output mirrored character */
 );
 
+#define fribidi_shape_mirroring FRIBIDI_NAMESPACE(shape_mirroring)
+/* fribidi_shape_mirroring - do mirroring shaping
+ *
+ * This functions replaces mirroring characters on right-to-left embeddings in
+ * string with their mirrored equivalent as returned by
+ * fribidi_get_mirror_char().
+ */
+FRIBIDI_ENTRY void fribidi_shape_mirroring (
+  const FriBidiLevel *embedding_level_list,	/* input list of embedding
+						   levels, as returned by
+						   fribidi_get_par_embedding_levels */
+  const FriBidiStrIndex len,	/* input string length */
+  FriBidiChar *str		/* string to shape */
+);
+
 #include "fribidi-enddecls.h"
 
 #endif /* !_FRIBIDI_MIRRORING_H */

Index: fribidi-run.c
===================================================================
RCS file: /cvs/fribidi/fribidi/lib/fribidi-run.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- fribidi-run.c	14 Jun 2004 17:00:33 -0000	1.4
+++ fribidi-run.c	14 Jun 2004 18:43:53 -0000	1.5
@@ -35,7 +35,7 @@
 
 #include "common.h"
 
-#include <fribidi-bidi-type.h>
+#include <fribidi-bidi-types.h>
 
 #include "run.h"
 #include "env.h"

Index: fribidi.c
===================================================================
RCS file: /cvs/fribidi/fribidi/lib/fribidi.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- fribidi.c	14 Jun 2004 17:00:33 -0000	1.9
+++ fribidi.c	14 Jun 2004 18:43:53 -0000	1.10
@@ -186,8 +186,9 @@
 
   fribidi_shape (embedding_level_list, len, visual_str);
 
-  status = fribidi_reorder_line (embedding_level_list, len, 0, NULL, visual_str,
-				 position_L_to_V_list, position_V_to_L_list);
+  status =
+    fribidi_reorder_line (embedding_level_list, len, 0, NULL, visual_str,
+			  position_L_to_V_list, position_V_to_L_list);
 
 out:
 

Index: fribidi.def
===================================================================
RCS file: /cvs/fribidi/fribidi/lib/fribidi.def,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- fribidi.def	13 Jun 2004 20:11:42 -0000	1.5
+++ fribidi.def	14 Jun 2004 18:43:53 -0000	1.6
@@ -1,15 +1,19 @@
-fribidi_get_bidi_type
-fribidi_get_mirror_char
-fribidi_bidi_type_name
 fribidi_get_par_embedding_levels
 fribidi_reorder_line
-fribidi_shape_mirroring
-fribidi_shape
-fribidi_remove_bidi_marks
-fribidi_log2vis
+fribidi_get_bidi_type
+fribidi_get_bidi_types
+fribidi_bidi_type_name
 fribidi_debug_status
 fribidi_set_debug
 fribidi_mirroring_status
 fribidi_set_mirroring
 fribidi_reorder_nsm_status
 fribidi_set_reorder_nsm
+fribidi_get_joining_type
+fribidi_get_joining_types
+fribidi_joining_type_name
+fribidi_get_mirror_char
+fribidi_shape_mirroring
+fribidi_shape
+fribidi_remove_bidi_marks
+fribidi_log2vis

Index: fribidi.h
===================================================================
RCS file: /cvs/fribidi/fribidi/lib/fribidi.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- fribidi.h	9 Jun 2004 20:01:00 -0000	1.5
+++ fribidi.h	14 Jun 2004 18:43:53 -0000	1.6
@@ -35,9 +35,13 @@
 #include "fribidi-unicode.h"
 #include "fribidi-types.h"
 #include "fribidi-env.h"
-#include "fribidi-bidi-type.h"
-#include "fribidi-bidi.h"
 #include "fribidi-mirroring.h"
+#include "fribidi-bidi-types.h"
+#include "fribidi-bidi.h"
+#if !FRIBIDI_NO_ARABIC
+#include "fribidi-joining-types.h"
+#include "fribidi-joining.h"
+#endif /* !FRIBIDI_NO_ARABIC */
 #if FRIBIDI_CHARSETS
 # include "fribidi-char-sets.h"
 #endif /* FRIBIDI_CHARSETS */


