Include a stripped-down version of fribidi to avoid the extra dependency.

Sun Nov 12 16:07:06 2000  Owen Taylor  <otaylor@redhat.com>

	* configure.in pango/pango-utils.[ch] pango/Makefile.am
	pango/mini-fribidi/*: Include a stripped-down version of fribidi
	to avoid the extra dependency. No fribidi symbols are
	exported so conflicts with the real fribidi should not
	happen. Library can optionally be compiled with the
	real libfribidi.

	* pango/pango-utils.[ch]: Wrappers for
	fribidi_ functions when compiling with fribiid.

	* modules/basic/basic-ft2.c modules/basic/basic-win32.c
	modules/basic/basic.c modules/thai/thai.c pango/Makefile.am
	pango/itemize.c pango/pango-context.c pango/pangoft2.c
	pango/pangowin32.c pango/pangox.c: Use pango_ versions of fribidi
	functions.

1 files changed, 101 insertions, 0 deletions

diff --git a/pango/mini-fribidi/fribidi_types.h b/pango/mini-fribidi/fribidi_types.h
new file mode 100644
index 00000000..edb9637e
--- /dev/null
+++ b/pango/mini-fribidi/fribidi_types.h
@@ -0,0 +1,101 @@
+/* FriBidi - Library of BiDi algorithm
+ * Copyright (C) 1999 Dov Grobgeld
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+#ifndef FRIBIDI_TYPES_H
+#define FRIBIDI_TYPES_H
+
+#include <glib.h>
+
+typedef guint32 FriBidiChar;
+
+#if 0
+/* Classifications of the various Bidi properties */
+typedef enum
+{
+  FRIBIDI_TYPE_LTR = 0x01000000, /* Strong left to right */
+  FRIBIDI_TYPE_RTL = 0x02000000, /* Strong right to left */
+  FRIBIDI_TYPE_WL  = 0x01000001, /* Weak left to right */
+  FRIBIDI_TYPE_WR  = 0x02000002, /* Weak right to left */
+  FRIBIDI_TYPE_EN  = 0x03000000, /* European digit */
+  FRIBIDI_TYPE_ES  = 0x04000000, /* European number separator */
+  FRIBIDI_TYPE_ET  = 0x05000000, /* European number terminator */
+  FRIBIDI_TYPE_AN  = 0x06000000, /* Arabic digit */
+  FRIBIDI_TYPE_CS  = 0x07000000, /* Common Separator */
+  FRIBIDI_TYPE_BS  = 0x08000000, /* Block separator */
+  FRIBIDI_TYPE_SS  = 0x09000000, /* Segment separator */
+  FRIBIDI_TYPE_WS  = 0x0A000000, /* Whitespace */
+  FRIBIDI_TYPE_CTL = 0x10000090, /* Control units */
+  FRIBIDI_TYPE_ON  = 0x80000009,  /* Other Neutral */
+
+  /* The following are only used internally */
+  FRIBIDI_TYPE_L   = 0x01000000, 
+  FRIBIDI_TYPE_R   = 0x02000000, 
+  FRIBIDI_TYPE_BN  = 0xF1000000, 
+  FRIBIDI_TYPE_CM  = 0xF2000000, 
+  FRIBIDI_TYPE_SOT = 0xF3000000, 
+  FRIBIDI_TYPE_EOT = 0xF4000000, 
+  FRIBIDI_TYPE_N   = 0xF5000000, 
+  FRIBIDI_TYPE_E   = 0xF6000000, 
+} FriBidiCharType;
+#endif
+
+typedef enum
+{
+  FRIBIDI_TYPE_LTR , /* Strong left to right */
+  FRIBIDI_TYPE_RTL , /* Right to left characters */
+  FRIBIDI_TYPE_WL  , /* Weak left to right */
+  FRIBIDI_TYPE_WR  , /* Weak right to left */
+  FRIBIDI_TYPE_EN  , /* European digit */
+  FRIBIDI_TYPE_ES  , /* European number separator */
+  FRIBIDI_TYPE_ET  , /* European number terminator */
+  FRIBIDI_TYPE_AN  , /* Arabic digit */
+  FRIBIDI_TYPE_CS  , /* Common Separator */
+  FRIBIDI_TYPE_BS  , /* Block separator */
+  FRIBIDI_TYPE_SS  , /* Segment separator */
+  FRIBIDI_TYPE_WS  , /* Whitespace */
+  FRIBIDI_TYPE_AL  , /* Arabic characters */
+  FRIBIDI_TYPE_NSM , /* Non spacing mark */
+  FRIBIDI_TYPE_LRE , /* Left-To-Right embedding */
+  FRIBIDI_TYPE_RLE , /* Right-To-Left embedding */
+  FRIBIDI_TYPE_LRO , /* Left-To-Right override */
+  FRIBIDI_TYPE_RLO , /* Right-To-Left override */
+  FRIBIDI_TYPE_PDF , /* Pop directional override */
+  FRIBIDI_TYPE_ON  ,  /* Other Neutral */
+
+  /* The following are only used internally */
+  FRIBIDI_TYPE_L = FRIBIDI_TYPE_LTR, 
+  FRIBIDI_TYPE_R = FRIBIDI_TYPE_RTL, 
+  FRIBIDI_TYPE_BN  = FRIBIDI_TYPE_ON + 2, 
+  FRIBIDI_TYPE_CM  , 
+  FRIBIDI_TYPE_SOT , 
+  FRIBIDI_TYPE_EOT , 
+  FRIBIDI_TYPE_N   , 
+  FRIBIDI_TYPE_E   , 
+  FRIBIDI_TYPE_CTL , /* Control units */
+  FRIBIDI_TYPE_EO , /* Control units */
+} FriBidiCharType;
+
+/* The following type is used by fribidi_utils */
+typedef struct {
+  int length;
+  void *attribute;
+} FriBidiRunType;
+
+FriBidiCharType _pango_fribidi_get_type(FriBidiChar uch);
+
+#endif