Clean up.

36 files changed, 316 insertions, 136 deletions

diff --git a/.indent.pro b/.indent.pro
index cf75157..8d7d012 100644
--- a/.indent.pro
+++ b/.indent.pro
@@ -1,3 +1,5 @@
+-gnu
+-bfda
 -T TypeLink
 -T LevelInfo
 -T FriBidiChar
diff --git a/fribidi.c b/fribidi.c
index 992c4b7..0d601cf 100644
--- a/fribidi.c
+++ b/fribidi.c
@@ -82,7 +82,8 @@ LevelInfo;
 
 
 static void
-bidi_string_reverse (FriBidiChar *str, FriBidiStrIndex len)
+bidi_string_reverse (FriBidiChar *str,
+		     FriBidiStrIndex len)
 {
   FriBidiStrIndex i;
   for (i = 0; i < len / 2; i++)
@@ -94,7 +95,8 @@ bidi_string_reverse (FriBidiChar *str, FriBidiStrIndex len)
 }
 
 static void
-index_array_reverse (FriBidiStrIndex *arr, FriBidiStrIndex len)
+index_array_reverse (FriBidiStrIndex *arr,
+		     FriBidiStrIndex len)
 {
   FriBidiStrIndex i;
   for (i = 0; i < len / 2; i++)
@@ -127,12 +129,12 @@ new_type_link (FriBidiEnv *fribidienv)
       static FriBidiMemChunk *mem_chunk = NULL;
 
       if (!mem_chunk)
-	mem_chunk =
-	  fribidi_mem_chunk_create (fribidienv,
-				    TypeLink, FRIBIDI_CHUNK_SIZE,
-				    FRIBIDI_ALLOC_ONLY);
+	mem_chunk = fribidi_mem_chunk_create (fribidienv, TypeLink,
+					      FRIBIDI_CHUNK_SIZE,
+					      FRIBIDI_ALLOC_ONLY);
 
-      link = fribidi_chunk_new (fribidienv, TypeLink, mem_chunk);
+      link = fribidi_chunk_new (fribidienv, TypeLink,
+				mem_chunk);
     }
 #endif /* !USE_SIMPLE_MALLOC */
 
@@ -145,7 +147,8 @@ new_type_link (FriBidiEnv *fribidienv)
 }
 
 static void
-free_type_link (FriBidiEnv *fribidienv, TypeLink *link)
+free_type_link (FriBidiEnv *fribidienv,
+		TypeLink *link)
 {
 #ifdef USE_SIMPLE_MALLOC
   fribidi_free (fribidienv, link);
@@ -165,7 +168,8 @@ free_type_link (FriBidiEnv *fribidienv, TypeLink *link)
 
 static TypeLink *
 run_length_encode_types (FriBidiEnv *fribidienv,
-			 FriBidiCharType *char_type, FriBidiStrIndex type_len)
+			 FriBidiCharType *char_type,
+			 FriBidiStrIndex type_len)
 {
   TypeLink *list, *last, *link;
 
@@ -202,7 +206,9 @@ run_length_encode_types (FriBidiEnv *fribidienv,
    the override_list.
 */
 static void
-init_list (FriBidiEnv *fribidienv, TypeLink **start, TypeLink **end)
+init_list (FriBidiEnv *fribidienv,
+	   TypeLink **start,
+	   TypeLink **end)
 {
   TypeLink *list;
   TypeLink *link;
@@ -233,7 +239,8 @@ init_list (FriBidiEnv *fribidienv, TypeLink **start, TypeLink **end)
    the list that p is currently in, if any.
 */
 static void
-move_element_before (TypeLink *p, TypeLink *list)
+move_element_before (TypeLink *p,
+		     TypeLink *list)
 {
   if (p->prev)
     {
@@ -261,7 +268,9 @@ move_element_before (TypeLink *p, TypeLink *list)
    TBD: use some explanatory names instead of p, q, ...
 */
 static void
-override_list (FriBidiEnv *fribidienv, TypeLink *base, TypeLink *over)
+override_list (FriBidiEnv *fribidienv,
+	       TypeLink *base,
+	       TypeLink *over)
 {
   TypeLink *p = base, *q, *r, *s, *t;
   FriBidiStrIndex pos = 0, pos2;
@@ -360,7 +369,8 @@ override_list (FriBidiEnv *fribidienv, TypeLink *base, TypeLink *over)
 #define RL_LEVEL(list) ((list)->level)
 
 static TypeLink *
-merge_with_prev (FriBidiEnv *fribidienv, TypeLink *second)
+merge_with_prev (FriBidiEnv *fribidienv,
+		 TypeLink *second)
 {
   TypeLink *first = second->prev;
   first->next = second->next;
@@ -371,7 +381,8 @@ merge_with_prev (FriBidiEnv *fribidienv, TypeLink *second)
 }
 
 static void
-compact_list (FriBidiEnv *fribidienv, TypeLink *list)
+compact_list (FriBidiEnv *fribidienv,
+	      TypeLink *list)
 {
   if (list->next)
     for (list = list->next; list; list = list->next)
@@ -381,7 +392,8 @@ compact_list (FriBidiEnv *fribidienv, TypeLink *list)
 }
 
 static void
-compact_neutrals (FriBidiEnv *fribidienv, TypeLink *list)
+compact_neutrals (FriBidiEnv *fribidienv,
+		  TypeLink *list)
 {
   if (list->next)
     {
@@ -572,10 +584,12 @@ print_bidi_string (FriBidiChar *str)
 static void
 fribidi_analyse_string (FriBidiEnv *fribidienv,
 			/* input */
-			const FriBidiChar *str, FriBidiStrIndex len,
+			const FriBidiChar *str,
+			FriBidiStrIndex len,
 			FriBidiCharType *pbase_dir,
 			/* output */
-			TypeLink **ptype_rl_list, FriBidiLevel *pmax_level)
+			TypeLink **ptype_rl_list,
+			FriBidiLevel *pmax_level)
 {
   FriBidiLevel base_level, max_level;
   FriBidiCharType base_dir;
@@ -1027,7 +1041,8 @@ fribidi_analyse_string (FriBidiEnv *fribidienv,
  *  fribidi_analyse_string(), after the list is not needed anymore.
  *----------------------------------------------------------------------*/
 static void
-free_rl_list (FriBidiEnv *fribidienv, TypeLink *type_rl_list)
+free_rl_list (FriBidiEnv *fribidienv,
+	      TypeLink *type_rl_list)
 {
 
   TypeLink *pp;
@@ -1073,7 +1088,8 @@ free_rl_list (FriBidiEnv *fribidienv, TypeLink *type_rl_list)
  *----------------------------------------------------------------------*/
 FRIBIDI_API FriBidiStrIndex
 fribidi_remove_bidi_marks (FriBidiEnv *fribidienv,
-			   FriBidiChar *str, FriBidiStrIndex length,
+			   FriBidiChar *str,
+			   FriBidiStrIndex length,
 			   FriBidiStrIndex *position_to_this_list,
 			   FriBidiStrIndex *position_from_this_list,
 			   FriBidiLevel *embedding_level_list)
@@ -1133,7 +1149,8 @@ fribidi_remove_bidi_marks (FriBidiEnv *fribidienv,
 FRIBIDI_API fribidi_boolean
 fribidi_log2vis (FriBidiEnv *fribidienv,
 		 /* input */
-		 const FriBidiChar *str, FriBidiStrIndex len,
+		 const FriBidiChar *str,
+		 FriBidiStrIndex len,
 		 FriBidiCharType *pbase_dir,
 		 /* output */
 		 FriBidiChar *visual_str,
@@ -1299,7 +1316,8 @@ fribidi_log2vis (FriBidiEnv *fribidienv,
 		if (RL_LEVEL (pp) >= level_idx)
 		  {
 		    /* Find all stretches that are >= level_idx */
-		    FriBidiStrIndex len = RL_LEN (pp), pos = RL_POS (pp);
+		    FriBidiStrIndex len = RL_LEN (pp),
+		      pos = RL_POS (pp);
 		    TypeLink *pp1 = pp->next;
 		    while (pp1->next && RL_LEVEL (pp1) >= level_idx)
 		      {
@@ -1368,7 +1386,8 @@ fribidi_log2vis_get_embedding_levels (FriBidiEnv *fribidienv,
 
   for (pp = type_rl_list->next; pp->next; pp = pp->next)
     {
-      FriBidiStrIndex i, pos = RL_POS (pp), len = RL_LEN (pp);
+      FriBidiStrIndex i, pos = RL_POS (pp),
+        len = RL_LEN (pp);
       FriBidiLevel level = RL_LEVEL (pp);
       for (i = 0; i < len; i++)
 	embedding_level_list[pos + i] = level;
diff --git a/fribidi.h b/fribidi.h
index 8f7acf6..b2b0f2b 100644
--- a/fribidi.h
+++ b/fribidi.h
@@ -253,7 +253,8 @@ extern "C"
  *----------------------------------------------------------------------*/
   FRIBIDI_API void fribidi_xpos_resolve (FriBidiEnv *fribidienv,
 					 /* input */
-					 int x_pos, int x_offset,
+					 int x_pos,
+					 int x_offset,
 					 FriBidiStrIndex len,
 					 const FriBidiLevel
 					 *embedding_level_list,
@@ -276,6 +277,7 @@ extern "C"
   FRIBIDI_API void fribidi_runs_log2vis (FriBidiEnv *fribidienv,
 					 /* input */
 					 const FriBidiList *logical_runs,	/* List of FriBidiRunType */
+
 					 FriBidiStrIndex len,
 					 const FriBidiStrIndex *log2vis,
 					 FriBidiCharType base_dir,
diff --git a/fribidi_benchmark.c b/fribidi_benchmark.c
index 670b911..c305870 100644
--- a/fribidi_benchmark.c
+++ b/fribidi_benchmark.c
@@ -40,7 +40,8 @@ extern char *fribidi_version_info;
 #define MAX_STR_LEN 1000
 
 static void
-die (char *fmt, ...)
+die (char *fmt,
+     ...)
 {
   va_list ap;
   va_start (ap, fmt);
@@ -98,7 +99,8 @@ utime (void)
 }
 
 static void
-benchmark (char *S_, int niter)
+benchmark (char *S_,
+	   int niter)
 {
   int len, i;
   FriBidiChar us[MAX_STR_LEN], out_us[MAX_STR_LEN];
@@ -182,7 +184,8 @@ benchmark (char *S_, int niter)
 }
 
 int
-main (int argc, char *argv[])
+main (int argc,
+      char *argv[])
 {
   niter = 2000;
 
diff --git a/fribidi_char_sets.c b/fribidi_char_sets.c
index e83d2fc..b202f25 100644
--- a/fribidi_char_sets.c
+++ b/fribidi_char_sets.c
@@ -31,12 +31,14 @@ typedef struct
 {
   /* Convert the character string "s" to unicode string "us" and
      return it's length. */
-  int (*charset_to_unicode) (char *s, int length,
+  int (*charset_to_unicode) (char *s,
+			     int length,
 			     /* output */
 			     FriBidiChar *us);
   /* Convert the unicode string "us" with length "length" to character
      string "s" and return it's length. */
-  int (*unicode_to_charset) (FriBidiChar *us, int length,
+  int (*unicode_to_charset) (FriBidiChar *us,
+			     int length,
 			     /* output */
 			     char *s);
   /* Charset's name. */
@@ -93,7 +95,9 @@ fribidi_parse_charset (char *s)
 /* Convert the character string "s" in charset "char_set" to unicode
    string "us" and return it's length. */
 FRIBIDI_API int
-fribidi_charset_to_unicode (FriBidiCharSet char_set, char *s, int length,
+fribidi_charset_to_unicode (FriBidiCharSet char_set,
+			    char *s,
+			    int length,
 			    /* output */
 			    FriBidiChar *us)
 {
@@ -105,7 +109,8 @@ fribidi_charset_to_unicode (FriBidiCharSet char_set, char *s, int length,
 /* Convert the unicode string "us" with length "length" to character
    string "s" in charset "char_set" and return it's length. */
 FRIBIDI_API int
-fribidi_unicode_to_charset (FriBidiCharSet char_set, FriBidiChar *us,
+fribidi_unicode_to_charset (FriBidiCharSet char_set,
+			    FriBidiChar *us,
 			    int length,
 			    /* output */
 			    char *s)
@@ -171,7 +176,8 @@ fribidi_char_set_leave (FriBidiCharSet char_set)
 
 /* Interface version 1, deprecated, just for compatibility. */
 FRIBIDI_API int
-fribidi_charset_to_unicode_1 (FriBidiCharSet char_set, char *s,
+fribidi_charset_to_unicode_1 (FriBidiCharSet char_set,
+			      char *s,
 			      /* output */
 			      FriBidiChar *us)
 {
diff --git a/fribidi_char_sets.h b/fribidi_char_sets.h
index 3dbf94e..47b21b2 100644
--- a/fribidi_char_sets.h
+++ b/fribidi_char_sets.h
@@ -64,14 +64,16 @@ extern "C"
 
 /* Convert the character string "s" in charset "char_set" to unicode
    string "us" and return it's length. */
-  int fribidi_charset_to_unicode (FriBidiCharSet char_set, char *s,
+  int fribidi_charset_to_unicode (FriBidiCharSet char_set,
+				  char *s,
 				  int length,
 				  /* output */
 				  FriBidiChar *us);
 
 /* Convert the unicode string "us" with length "length" to character
    string "s" in charset "char_set" and return it's length. */
-  int fribidi_unicode_to_charset (FriBidiCharSet char_set, FriBidiChar *us,
+  int fribidi_unicode_to_charset (FriBidiCharSet char_set,
+				  FriBidiChar *us,
 				  int length,
 				  /* output */
 				  char *s);
@@ -102,7 +104,8 @@ extern "C"
 #ifdef FRIBIDI_INTERFACE_1
 /* Interface version 1, deprecated, just for compatibility. */
 
-  int fribidi_charset_to_unicode_1 (FriBidiCharSet char_set, char *s,
+  int fribidi_charset_to_unicode_1 (FriBidiCharSet char_set,
+				    char *s,
 				    /* output */
 				    FriBidiChar *us);
 #define fribidi_charset_to_unicode	fribidi_charset_to_unicode_1
diff --git a/fribidi_char_sets_cap_rtl.c b/fribidi_char_sets_cap_rtl.c
index ff4a19f..73231cf 100644
--- a/fribidi_char_sets_cap_rtl.c
+++ b/fribidi_char_sets_cap_rtl.c
@@ -103,7 +103,9 @@ fribidi_unicode_to_cap_rtl_c (FriBidiChar uch)
 }
 
 int
-fribidi_cap_rtl_to_unicode (char *s, int len, FriBidiChar *us)
+fribidi_cap_rtl_to_unicode (char *s,
+			    int len,
+			    FriBidiChar *us)
 {
   int i, j;
 
@@ -155,7 +157,9 @@ fribidi_cap_rtl_to_unicode (char *s, int len, FriBidiChar *us)
 }
 
 int
-fribidi_unicode_to_cap_rtl (FriBidiChar *us, int length, char *s)
+fribidi_unicode_to_cap_rtl (FriBidiChar *us,
+			    int length,
+			    char *s)
 {
   int i, j;
 
diff --git a/fribidi_char_sets_cap_rtl.h b/fribidi_char_sets_cap_rtl.h
index 3d58c3c..27b2de3 100644
--- a/fribidi_char_sets_cap_rtl.h
+++ b/fribidi_char_sets_cap_rtl.h
@@ -40,10 +40,12 @@ extern "C"
   fribidi_boolean fribidi_char_set_enter_cap_rtl (void);
   fribidi_boolean fribidi_char_set_leave_cap_rtl (void);
 
-  int fribidi_cap_rtl_to_unicode (char *s, int length,
+  int fribidi_cap_rtl_to_unicode (char *s,
+				  int length,
 				  /* Output */
 				  FriBidiChar *us);
-  int fribidi_unicode_to_cap_rtl (FriBidiChar *us, int length,
+  int fribidi_unicode_to_cap_rtl (FriBidiChar *us,
+				  int length,
 				  /* Output */
 				  char *s);
 
diff --git a/fribidi_char_sets_cp1255.c b/fribidi_char_sets_cp1255.c
index 57b8d55..3f48a54 100644
--- a/fribidi_char_sets_cp1255.c
+++ b/fribidi_char_sets_cp1255.c
@@ -70,7 +70,9 @@ fribidi_cp1255_to_unicode_c (char sch)
 }
 
 int
-fribidi_cp1255_to_unicode (char *s, int len, FriBidiChar *us)
+fribidi_cp1255_to_unicode (char *s,
+			   int len,
+			   FriBidiChar *us)
 {
   int i;
 
@@ -97,7 +99,9 @@ fribidi_unicode_to_cp1255_c (FriBidiChar uch)
 }
 
 int
-fribidi_unicode_to_cp1255 (FriBidiChar *us, int length, char *s)
+fribidi_unicode_to_cp1255 (FriBidiChar *us,
+			   int length,
+			   char *s)
 {
   int i;
 
diff --git a/fribidi_char_sets_cp1255.h b/fribidi_char_sets_cp1255.h
index 758a7ec..a7f57a4 100644
--- a/fribidi_char_sets_cp1255.h
+++ b/fribidi_char_sets_cp1255.h
@@ -41,11 +41,13 @@ extern "C"
 #define fribidi_char_set_leave_cp1255 NULL
 
   FriBidiChar fribidi_cp1255_to_unicode_c (char ch);
-  int fribidi_cp1255_to_unicode (char *s, int length,
+  int fribidi_cp1255_to_unicode (char *s,
+				 int length,
 				 /* Output */
 				 FriBidiChar *us);
   char fribidi_unicode_to_cp1255_c (FriBidiChar uch);
-  int fribidi_unicode_to_cp1255 (FriBidiChar *us, int length,
+  int fribidi_unicode_to_cp1255 (FriBidiChar *us,
+				 int length,
 				 /* Output */
 				 char *s);
 
diff --git a/fribidi_char_sets_cp1256.c b/fribidi_char_sets_cp1256.c
index c687319..c27bc7a 100644
--- a/fribidi_char_sets_cp1256.c
+++ b/fribidi_char_sets_cp1256.c
@@ -65,7 +65,9 @@ fribidi_cp1256_to_unicode_c (char sch)
 }
 
 int
-fribidi_cp1256_to_unicode (char *s, int len, FriBidiChar *us)
+fribidi_cp1256_to_unicode (char *s,
+			   int len,
+			   FriBidiChar *us)
 {
   int i;
 
@@ -216,7 +218,9 @@ fribidi_unicode_to_cp1256_c (FriBidiChar uch)
 }
 
 int
-fribidi_unicode_to_cp1256 (FriBidiChar *us, int length, char *s)
+fribidi_unicode_to_cp1256 (FriBidiChar *us,
+			   int length,
+			   char *s)
 {
   int i;
 
diff --git a/fribidi_char_sets_cp1256.h b/fribidi_char_sets_cp1256.h
index 77e70d8..333418f 100644
--- a/fribidi_char_sets_cp1256.h
+++ b/fribidi_char_sets_cp1256.h
@@ -41,11 +41,13 @@ extern "C"
 #define fribidi_char_set_leave_cp1256 NULL
 
   FriBidiChar fribidi_cp1256_to_unicode_c (char ch);
-  int fribidi_cp1256_to_unicode (char *s, int length,
+  int fribidi_cp1256_to_unicode (char *s,
+				 int length,
 				 /* Output */
 				 FriBidiChar *us);
   char fribidi_unicode_to_cp1256_c (FriBidiChar uch);
-  int fribidi_unicode_to_cp1256 (FriBidiChar *us, int length,
+  int fribidi_unicode_to_cp1256 (FriBidiChar *us,
+				 int length,
 				 /* Output */
 				 char *s);
 
diff --git a/fribidi_char_sets_isiri_3342.c b/fribidi_char_sets_isiri_3342.c
index 88d4360..2d73167 100644
--- a/fribidi_char_sets_isiri_3342.c
+++ b/fribidi_char_sets_isiri_3342.c
@@ -57,7 +57,9 @@ fribidi_isiri_3342_to_unicode_c (char sch)
 }
 
 int
-fribidi_isiri_3342_to_unicode (char *s, int len, FriBidiChar *us)
+fribidi_isiri_3342_to_unicode (char *s,
+			       int len,
+			       FriBidiChar *us)
 {
   int i;
 
@@ -218,7 +220,9 @@ fribidi_unicode_to_isiri_3342_c (FriBidiChar uch)
 }
 
 int
-fribidi_unicode_to_isiri_3342 (FriBidiChar *us, int length, char *s)
+fribidi_unicode_to_isiri_3342 (FriBidiChar *us,
+			       int length,
+			       char *s)
 {
   int i;
 
diff --git a/fribidi_char_sets_isiri_3342.h b/fribidi_char_sets_isiri_3342.h
index 69e4245..21b4eeb 100644
--- a/fribidi_char_sets_isiri_3342.h
+++ b/fribidi_char_sets_isiri_3342.h
@@ -41,11 +41,13 @@ extern "C"
 #define fribidi_char_set_leave_isiri_3342 NULL
 
   FriBidiChar fribidi_isiri_3342_to_unicode_c (char ch);
-  int fribidi_isiri_3342_to_unicode (char *s, int length,
+  int fribidi_isiri_3342_to_unicode (char *s,
+				     int length,
 				     /* Output */
 				     FriBidiChar *us);
   char fribidi_unicode_to_isiri_3342_c (FriBidiChar uch);
-  int fribidi_unicode_to_isiri_3342 (FriBidiChar *us, int length,
+  int fribidi_unicode_to_isiri_3342 (FriBidiChar *us,
+				     int length,
 				     /* Output */
 				     char *s);
 
diff --git a/fribidi_char_sets_iso8859_6.c b/fribidi_char_sets_iso8859_6.c
index f30d54d..27633a6 100644
--- a/fribidi_char_sets_iso8859_6.c
+++ b/fribidi_char_sets_iso8859_6.c
@@ -44,7 +44,9 @@ fribidi_iso8859_6_to_unicode_c (char sch)
 }
 
 int
-fribidi_iso8859_6_to_unicode (char *s, int len, FriBidiChar *us)
+fribidi_iso8859_6_to_unicode (char *s,
+			      int len,
+			      FriBidiChar *us)
 {
   int i;
 
@@ -73,7 +75,9 @@ fribidi_unicode_to_iso8859_6_c (FriBidiChar uch)
 }
 
 int
-fribidi_unicode_to_iso8859_6 (FriBidiChar *us, int length, char *s)
+fribidi_unicode_to_iso8859_6 (FriBidiChar *us,
+			      int length,
+			      char *s)
 {
   int i;
 
diff --git a/fribidi_char_sets_iso8859_6.h b/fribidi_char_sets_iso8859_6.h
index 9227036..04f4f74 100644
--- a/fribidi_char_sets_iso8859_6.h
+++ b/fribidi_char_sets_iso8859_6.h
@@ -41,11 +41,13 @@ extern "C"
 #define fribidi_char_set_leave_iso8859_6 NULL
 
   FriBidiChar fribidi_iso8859_6_to_unicode_c (char ch);
-  int fribidi_iso8859_6_to_unicode (char *s, int length,
+  int fribidi_iso8859_6_to_unicode (char *s,
+				    int length,
 				    /* Output */
 				    FriBidiChar *us);
   char fribidi_unicode_to_iso8859_6_c (FriBidiChar uch);
-  int fribidi_unicode_to_iso8859_6 (FriBidiChar *us, int length,
+  int fribidi_unicode_to_iso8859_6 (FriBidiChar *us,
+				    int length,
 				    /* Output */
 				    char *s);
 
diff --git a/fribidi_char_sets_iso8859_8.c b/fribidi_char_sets_iso8859_8.c
index 0cbe9d0..e2c12d2 100644
--- a/fribidi_char_sets_iso8859_8.c
+++ b/fribidi_char_sets_iso8859_8.c
@@ -72,7 +72,9 @@ fribidi_iso8859_8_to_unicode_c (char sch)
 }
 
 int
-fribidi_iso8859_8_to_unicode (char *s, int len, FriBidiChar *us)
+fribidi_iso8859_8_to_unicode (char *s,
+			      int len,
+			      FriBidiChar *us)
 {
   int i;
 
@@ -110,7 +112,9 @@ fribidi_unicode_to_iso8859_8_c (FriBidiChar uch)
 }
 
 int
-fribidi_unicode_to_iso8859_8 (FriBidiChar *us, int length, char *s)
+fribidi_unicode_to_iso8859_8 (FriBidiChar *us,
+			      int length,
+			      char *s)
 {
   int i;
 
diff --git a/fribidi_char_sets_iso8859_8.h b/fribidi_char_sets_iso8859_8.h
index ee49429..04dd80d 100644
--- a/fribidi_char_sets_iso8859_8.h
+++ b/fribidi_char_sets_iso8859_8.h
@@ -41,11 +41,13 @@ extern "C"
 #define fribidi_char_set_leave_iso8859_8 NULL
 
   FriBidiChar fribidi_iso8859_8_to_unicode_c (char ch);
-  int fribidi_iso8859_8_to_unicode (char *s, int length,
+  int fribidi_iso8859_8_to_unicode (char *s,
+				    int length,
 				    /* Output */
 				    FriBidiChar *us);
   char fribidi_unicode_to_iso8859_8_c (FriBidiChar uch);
-  int fribidi_unicode_to_iso8859_8 (FriBidiChar *us, int length,
+  int fribidi_unicode_to_iso8859_8 (FriBidiChar *us,
+				    int length,
 				    /* Output */
 				    char *s);
 
diff --git a/fribidi_char_sets_utf8.c b/fribidi_char_sets_utf8.c
index 1ce8e28..98f8916 100644
--- a/fribidi_char_sets_utf8.c
+++ b/fribidi_char_sets_utf8.c
@@ -29,7 +29,9 @@
 /* the following added by Raphael Finkel <raphael@cs.uky.edu> 12/1999 */
 
 int
-fribidi_utf8_to_unicode (char *s, int len, FriBidiChar *us)
+fribidi_utf8_to_unicode (char *s,
+			 int len,
+			 FriBidiChar *us)
 /* warning: the length of input string may exceed the length of the output */
 {
   int length;
@@ -64,7 +66,9 @@ fribidi_utf8_to_unicode (char *s, int len, FriBidiChar *us)
 }
 
 int
-fribidi_unicode_to_utf8 (FriBidiChar *us, int length, char *s)
+fribidi_unicode_to_utf8 (FriBidiChar *us,
+			 int length,
+			 char *s)
 /* warning: the length of output string may exceed the length of the input */
 {
   int i;
diff --git a/fribidi_char_sets_utf8.h b/fribidi_char_sets_utf8.h
index 079ea62..648cfd7 100644
--- a/fribidi_char_sets_utf8.h
+++ b/fribidi_char_sets_utf8.h
@@ -40,13 +40,15 @@ extern "C"
 #define fribidi_char_set_enter_utf8 NULL
 #define fribidi_char_set_leave_utf8 NULL
 
-  int fribidi_unicode_to_utf8 (FriBidiChar *us, int length,
+  int fribidi_unicode_to_utf8 (FriBidiChar *us,
+			       int length,
 			       /* Output */
 			       char *s);
 
 /* warning: the length of output string may exceed the length of the input */
 /* the length of the string is returned */
-  int fribidi_utf8_to_unicode (char *s, int length,
+  int fribidi_utf8_to_unicode (char *s,
+			       int length,
 			       /* Output */
 			       FriBidiChar *us);
 
diff --git a/fribidi_char_type.c b/fribidi_char_type.c
index 5d72881..7269b4f 100644
--- a/fribidi_char_type.c
+++ b/fribidi_char_type.c
@@ -30,7 +30,8 @@
 FRIBIDI_API FriBidiCharType fribidi_get_type_internal (FriBidiChar uch);
 
 FRIBIDI_API FriBidiCharType
-fribidi_get_type (FriBidiEnv *env, FriBidiChar uch)
+fribidi_get_type (FriBidiEnv *env,
+		  FriBidiChar uch)
 {
   return fribidi_get_type_internal (uch);
 }
@@ -38,7 +39,8 @@ fribidi_get_type (FriBidiEnv *env, FriBidiChar uch)
 FRIBIDI_API void
 fribidi_get_types (FriBidiEnv *env,
 		   /* input */
-		   const FriBidiChar *str, FriBidiStrIndex len,
+		   const FriBidiChar *str,
+		   FriBidiStrIndex len,
 		   /* output */
 		   FriBidiCharType *type)
 {
diff --git a/fribidi_config.h.in b/fribidi_config.h.in
index 4eb0185..2e4e3d9 100644
--- a/fribidi_config.h.in
+++ b/fribidi_config.h.in
@@ -23,3 +23,16 @@
 #else
 #define FRIBIDI_API
 #endif
+
+/* __BEGIN_DECLS should be used at the beginning of your declarations,
+ * so that C++ compilers don't mangle their names.  Use __END_DECLS at
+ * the end of C declarations. */
+#undef __BEGIN_DECLS
+#undef __END_DECLS
+#ifdef __cplusplus
+#define __BEGIN_DECLS extern "C" {
+#define __END_DECLS }
+#else
+#define __BEGIN_DECLS		/* empty */
+#define __END_DECLS		/* empty */
+#endif
diff --git a/fribidi_create_char_types.c b/fribidi_create_char_types.c
index e2e0cab..9ae47a8 100644
--- a/fribidi_create_char_types.c
+++ b/fribidi_create_char_types.c
@@ -40,7 +40,8 @@ err (char *msg)
 }
 
 static void
-err2 (char *fmt, char *p)
+err2 (char *fmt,
+      char *p)
 {
   fprintf (stderr, "fribidi_create_char_types: ");
   fprintf (stderr, fmt, p);
@@ -112,8 +113,9 @@ static void
 init_table ()
 {
   int i;
-  int deftype = get_type (default_type), RTL = get_type ("RTL"), AL =
-    get_type ("AL");
+  int deftype = get_type (default_type),
+    RTL = get_type ("RTL"),
+    AL = get_type ("AL");
 
   for (i = 0; i < type_names_count; i++)
     names[i] = 0;
@@ -170,7 +172,8 @@ headermacro (char *file)
 }
 
 static void
-write_char_type (char *file, int max_depth)
+write_char_type (char *file,
+		 int max_depth)
 {
   int i;
   FILE *f;
@@ -227,7 +230,8 @@ write_char_type (char *file, int max_depth)
 }
 
 int
-main (int argc, char **argv)
+main (int argc,
+      char **argv)
 {
   int max_depth;
   char file[50], *p;
diff --git a/fribidi_create_mirroring.c b/fribidi_create_mirroring.c
index 398802d..d0aa9be 100644
--- a/fribidi_create_mirroring.c
+++ b/fribidi_create_mirroring.c
@@ -28,7 +28,8 @@
 #include "fribidi_unicode.h"
 
 static void
-err2 (char *fmt, char *p)
+err2 (char *fmt,
+      char *p)
 {
   fprintf (stderr, "fribidi_create_mirroring: error: ");
   fprintf (stderr, fmt, p);
@@ -128,7 +129,8 @@ write_mirror (char *file)
 }
 
 int
-main (int argc, char **argv)
+main (int argc,
+      char **argv)
 {
   char *p;
 
diff --git a/fribidi_env.c b/fribidi_env.c
index e8240e8..56d267e 100644
--- a/fribidi_env.c
+++ b/fribidi_env.c
@@ -55,7 +55,8 @@
  *----------------------------------------------------------------------*/
 
 void
-init_fribidienv (FriBidiEnv *fribidienv, FriBidiFlags aFlags)
+init_fribidienv (FriBidiEnv *fribidienv,
+		 FriBidiFlags aFlags)
 {
   VALIDATE_FRIBIDIENV (fribidienv);
   fribidienv->iAllocatedMemoryChunks = NULL;
@@ -94,7 +95,8 @@ destroy_fribidienv (FriBidiEnv *fribidienv)
  * environments, which support exceptions.
  *----------------------------------------------------------------------*/
 void *
-fribidi_malloc (FriBidiEnv *fribidienv, int size)
+fribidi_malloc (FriBidiEnv *fribidienv,
+		int size)
 {
   FriBidiMemChunkPrefix *lChunk_ptr;
   FriBidiMemChunkPrefix *lNextChunk_ptr;
@@ -141,7 +143,8 @@ fribidi_malloc (FriBidiEnv *fribidienv, int size)
  * If the memory chunk is not properly linked, then panic.
  *----------------------------------------------------------------------*/
 void
-fribidi_free (FriBidiEnv *fribidienv, void *ptr)
+fribidi_free (FriBidiEnv *fribidienv,
+	      void *ptr)
 {
   FriBidiMemChunkPrefix *lChunk_ptr;
   FriBidiMemChunkPrefix *lNextChunk_ptr;
@@ -196,7 +199,8 @@ fribidi_mirroring_status (FriBidiEnv *fbenv)
  *  fribidi_set_mirroring() sets mirroring on or off.
  *----------------------------------------------------------------------*/
 void
-fribidi_set_mirroring (FriBidiEnv *fbenv, fribidi_boolean mirror)
+fribidi_set_mirroring (FriBidiEnv *fbenv,
+		       fribidi_boolean mirror)
 {
   VALIDATE_FRIBIDIENV (fbenv);
 
@@ -229,7 +233,8 @@ fribidi_reorder_nsm_status (FriBidiEnv *fbenv)
  *  fribidi_set_reorder_nsm() sets reordering of nsm sequences on or off.
  *----------------------------------------------------------------------*/
 void
-fribidi_set_reorder_nsm (FriBidiEnv *fbenv, fribidi_boolean reorder)
+fribidi_set_reorder_nsm (FriBidiEnv *fbenv,
+			 fribidi_boolean reorder)
 {
   VALIDATE_FRIBIDIENV (fbenv);
 
@@ -267,7 +272,8 @@ fribidi_debug_status (FriBidiEnv *fbenv)
  *  returns FRIBIDI_FALSE.
  *----------------------------------------------------------------------*/
 fribidi_boolean
-fribidi_set_debug (FriBidiEnv *fbenv, fribidi_boolean debug)
+fribidi_set_debug (FriBidiEnv *fbenv,
+		   fribidi_boolean debug)
 {
 #ifdef DEBUG
   VALIDATE_FRIBIDIENV (fbenv);
diff --git a/fribidi_env.h b/fribidi_env.h
index 88d15dc..80f9368 100644
--- a/fribidi_env.h
+++ b/fribidi_env.h
@@ -146,7 +146,8 @@ extern "C"
  *
  *  It initializes the doubly-linked list of memory chunks and the flags.
  *----------------------------------------------------------------------*/
-  void init_fribidienv (FriBidiEnv *fribidienv, FriBidiFlags aFlags);
+  void init_fribidienv (FriBidiEnv *fribidienv,
+			FriBidiFlags aFlags);
 
 
 /*======================================================================
@@ -163,7 +164,8 @@ extern "C"
  * This function may throw an Out-Of-Memory exception in
  * environments, which support exceptions.
  *----------------------------------------------------------------------*/
-  void *fribidi_malloc (FriBidiEnv *fribidienv, int size);
+  void *fribidi_malloc (FriBidiEnv *fribidienv,
+			int size);
 
 
 /*======================================================================
@@ -171,7 +173,8 @@ extern "C"
  * FriBidiEnv instance and free it.
  * If the memory chunk is not properly linked, then panic.
  *----------------------------------------------------------------------*/
-  void fribidi_free (FriBidiEnv *fribidienv, void *ptr);
+  void fribidi_free (FriBidiEnv *fribidienv,
+		     void *ptr);
 
 
 /*====================================================================*/
@@ -204,7 +207,8 @@ extern "C"
 /*======================================================================
  *  fribidi_set_mirroring() sets mirroring on or off.
  *----------------------------------------------------------------------*/
-  void fribidi_set_mirroring (FriBidiEnv *fbenv, fribidi_boolean mirror);
+  void fribidi_set_mirroring (FriBidiEnv *fbenv,
+			      fribidi_boolean mirror);
 
 /*======================================================================
  *  fribidi_reorder_nsm_status() returns whether reordering of nsm
@@ -215,7 +219,8 @@ extern "C"
 /*======================================================================
  *  fribidi_set_reorder_nsm() sets reordering of nsm sequences on or off.
  *----------------------------------------------------------------------*/
-  void fribidi_set_reorder_nsm (FriBidiEnv *fbenv, fribidi_boolean reorder);
+  void fribidi_set_reorder_nsm (FriBidiEnv *fbenv,
+				fribidi_boolean reorder);
 
 /*======================================================================
  *  fribidi_debug_status() returns whether debugging is on or off,
diff --git a/fribidi_main.c b/fribidi_main.c
index a3c6fab..cc29348 100644
--- a/fribidi_main.c
+++ b/fribidi_main.c
@@ -48,7 +48,8 @@ extern char *fribidi_version_info;
 
 #define ALLOCATE(frenv, tp,ln) ((tp *) fribidi_malloc (frenv, sizeof (tp) * (ln)))
 static void
-die (char *fmt, ...)
+die (char *fmt,
+     ...)
 {
   va_list ap;
   va_start (ap, fmt);
@@ -160,7 +161,8 @@ version (void)
 }
 
 int
-main (int argc, char *argv[])
+main (int argc,
+      char *argv[])
 {
   int exit_val;
   fribidi_boolean file_found;
@@ -403,14 +405,14 @@ main (int argc, char *argv[])
 	      FriBidiStrIndex new_len;
 	      fribidi_boolean log2vis;
 
-	      visual =
-		show_visual ? ALLOCATE (NULL, FriBidiChar, len + 1) : NULL;
-	      ltov =
-		show_ltov ? ALLOCATE (NULL, FriBidiStrIndex, len + 1) : NULL;
-	      vtol =
-		show_vtol ? ALLOCATE (NULL, FriBidiStrIndex, len + 1) : NULL;
-	      levels =
-		show_levels ? ALLOCATE (NULL, FriBidiLevel, len + 1) : NULL;
+	      visual = show_visual ? ALLOCATE (NULL, FriBidiChar,
+					       len + 1) : NULL;
+	      ltov = show_ltov ? ALLOCATE (NULL, FriBidiStrIndex,
+					   len + 1) : NULL;
+	      vtol = show_vtol ? ALLOCATE (NULL, FriBidiStrIndex,
+					   len + 1) : NULL;
+	      levels = show_levels ? ALLOCATE (NULL, FriBidiLevel,
+					       len + 1) : NULL;
 
 	      /* Create a bidi string. */
 	      base = input_base_direction;
diff --git a/fribidi_mem.c b/fribidi_mem.c
index eca78e7..fd27cfc 100644
--- a/fribidi_mem.c
+++ b/fribidi_mem.c
@@ -36,7 +36,9 @@ struct _FriBidiMemChunk
 };
 
 FriBidiList *
-fribidi_list_append (FriBidiEnv *fribidienv, FriBidiList *list, void *data)
+fribidi_list_append (FriBidiEnv *fribidienv,
+		     FriBidiList *list,
+		     void *data)
 {
   FriBidiList *node, *last;
 
@@ -56,7 +58,9 @@ fribidi_list_append (FriBidiEnv *fribidienv, FriBidiList *list, void *data)
 
 FriBidiMemChunk *
 fribidi_mem_chunk_new (FriBidiEnv *fribidienv,
-		       char *name, int atom_size, unsigned long area_size,
+		       char *name,
+		       int atom_size,
+		       unsigned long area_size,
 		       int type)
 {
   FriBidiMemChunk *m =
@@ -74,14 +78,16 @@ fribidi_mem_chunk_new (FriBidiEnv *fribidienv,
 }
 
 void
-fribidi_mem_chunk_destroy (FriBidiEnv *fribidienv, FriBidiMemChunk *mem_chunk)
+fribidi_mem_chunk_destroy (FriBidiEnv *fribidienv,
+			   FriBidiMemChunk *mem_chunk)
 {
   fribidi_free (fribidienv, mem_chunk);
   return;
 }
 
 void *
-fribidi_mem_chunk_alloc (FriBidiEnv *fribidienv, FriBidiMemChunk *mem_chunk)
+fribidi_mem_chunk_alloc (FriBidiEnv *fribidienv,
+			 FriBidiMemChunk *mem_chunk)
 {
   void *m;
 
@@ -105,7 +111,8 @@ fribidi_mem_chunk_alloc (FriBidiEnv *fribidienv, FriBidiMemChunk *mem_chunk)
 
 void
 fribidi_mem_chunk_free (FriBidiEnv *fribidienv,
-			FriBidiMemChunk *mem_chunk, void *mem)
+			FriBidiMemChunk *mem_chunk,
+			void *mem)
 {
   if (mem_chunk->type == FRIBIDI_ALLOC_AND_FREE)
     fribidi_free (fribidienv, mem);
@@ -113,7 +120,8 @@ fribidi_mem_chunk_free (FriBidiEnv *fribidienv,
 }
 
 int
-fribidi_strcasecmp (const char *s1, const char *s2)
+fribidi_strcasecmp (const char *s1,
+		    const char *s2)
 {
   while (*s1 && toupper (*s1) == toupper (*s2))
     {
diff --git a/fribidi_mem.h b/fribidi_mem.h
index a495194..e7bb19e 100644
--- a/fribidi_mem.h
+++ b/fribidi_mem.h
@@ -67,7 +67,8 @@ extern "C"
   typedef struct _FriBidiEnv FriBidiEnv;
 
   FriBidiList *fribidi_list_append (FriBidiEnv *fribidienv,
-				    FriBidiList *list, void *data);
+				    FriBidiList *list,
+				    void *data);
 
   typedef struct _FriBidiMemChunk FriBidiMemChunk;
 
@@ -77,7 +78,8 @@ extern "C"
   FriBidiMemChunk *fribidi_mem_chunk_new (FriBidiEnv *fribidienv,
 					  char *name,
 					  int atom_size,
-					  unsigned long area_size, int type);
+					  unsigned long area_size,
+					  int type);
   void fribidi_mem_chunk_destroy (FriBidiEnv *fribidienv,
 				  FriBidiMemChunk *mem_chunk);
   void *fribidi_mem_chunk_alloc (FriBidiEnv *fribidienv,
@@ -85,7 +87,8 @@ extern "C"
   void *fribidi_mem_chunk_alloc0 (FriBidiEnv *fribidienv,
 				  FriBidiMemChunk *mem_chunk);
   void fribidi_mem_chunk_free (FriBidiEnv *fribidienv,
-			       FriBidiMemChunk *mem_chunk, void *mem);
+			       FriBidiMemChunk *mem_chunk,
+			       void *mem);
 
 #define fribidi_mem_chunk_create(fbenv, type, pre_alloc, alloc_type) ( \
   fribidi_mem_chunk_new (fbenv, \
@@ -98,7 +101,8 @@ extern "C"
   (type *) fribidi_mem_chunk_alloc (fbenv, chunk) \
 )
 
-  int fribidi_strcasecmp (const char *s1, const char *s2);
+  int fribidi_strcasecmp (const char *s1,
+			  const char *s2);
 
 #ifdef	__cplusplus
 }
diff --git a/fribidi_utils.c b/fribidi_utils.c
index 3321d25..d9ff131 100644
--- a/fribidi_utils.c
+++ b/fribidi_utils.c
@@ -64,11 +64,15 @@ FRIBIDI_API void
 fribidi_map_range (FriBidiEnv *fribidienv,
 		   /* input */
 		   FriBidiStrIndex in_span[2],	/* Start and end span */
-		   FriBidiStrIndex len, fribidi_boolean is_v2l_map,	/* Needed for embedding_level */
+
+		   FriBidiStrIndex len,
+		   fribidi_boolean is_v2l_map,	/* Needed for embedding_level */
+
 		   const FriBidiStrIndex *position_map,
 		   const FriBidiLevel *embedding_level_list,
 		   /* output */
-		   int *num_mapped_spans, FriBidiStrIndex mapped_spans[63][2])
+		   int *num_mapped_spans,
+		   FriBidiStrIndex mapped_spans[63][2])
 {
   FriBidiStrIndex ch_idx;
   fribidi_boolean in_range = FRIBIDI_FALSE;
@@ -195,10 +199,13 @@ fribidi_find_string_changes (FriBidiEnv *fribidienv,
 FRIBIDI_API void
 fribidi_xpos_resolve (FriBidiEnv *fribidienv,
 		      /* input */
-		      int x_pos, int x_offset, FriBidiStrIndex len,
+		      int x_pos,
+		      int x_offset,
+		      FriBidiStrIndex len,
 		      const FriBidiLevel *embedding_level_list,
 		      FriBidiCharType base_dir,
-		      const FriBidiStrIndex *vis2log, const int *char_widths,
+		      const FriBidiStrIndex *vis2log,
+		      const int *char_widths,
 		      /* output */
 		      FriBidiStrIndex *res_log_pos,
 		      FriBidiStrIndex *res_vis_pos,
@@ -304,7 +311,8 @@ fribidi_xpos_resolve (FriBidiEnv *fribidienv,
 FRIBIDI_API fribidi_boolean
 fribidi_is_char_rtl (FriBidiEnv *fribidienv,
 		     const FriBidiLevel *embedding_level_list,
-		     FriBidiCharType base_dir, FriBidiStrIndex idx)
+		     FriBidiCharType base_dir,
+		     FriBidiStrIndex idx)
 {
   if (!embedding_level_list || idx < 0)
     return FRIBIDI_IS_RTL (base_dir);
@@ -322,8 +330,12 @@ FRIBIDI_API void
 fribidi_runs_log2vis (FriBidiEnv *fribidienv,
 		      /* input */
 		      const FriBidiList *logical_runs,	/* List of FriBidiRunType */
-		      FriBidiStrIndex len, const FriBidiStrIndex *log2vis, FriBidiCharType base_dir,	/* TBD: remove it, not needed */
+
+		      FriBidiStrIndex len,
+		      const FriBidiStrIndex *log2vis,
+		      FriBidiCharType base_dir,	/* TBD: remove it, not needed */
 		      /* output */
+
 		      FriBidiList **visual_runs)
 {
   void **visual_attribs =
diff --git a/fribidi_wcwidth.c b/fribidi_wcwidth.c
index 6ffe6a5..2c5217b 100644
--- a/fribidi_wcwidth.c
+++ b/fribidi_wcwidth.c
@@ -69,7 +69,9 @@ struct interval
 
 /* auxiliary function for binary search in interval table */
 static int
-bisearch (wchar_t ucs, const struct interval *table, int max)
+bisearch (wchar_t ucs,
+	  const struct interval *table,
+	  int max)
 {
   int min = 0;
   int mid;
@@ -192,7 +194,8 @@ mk_wcwidth (wchar_t ucs)
 
 
 int
-mk_wcswidth (const wchar_t * pwcs, size_t n)
+mk_wcswidth (const wchar_t * pwcs,
+	     size_t n)
 {
   int w, width = 0;
 
@@ -284,7 +287,8 @@ mk_wcwidth_cjk (wchar_t ucs)
 
 
 int
-mk_wcswidth_cjk (const wchar_t * pwcs, size_t n)
+mk_wcswidth_cjk (const wchar_t * pwcs,
+		 size_t n)
 {
   int w, width = 0;
 
diff --git a/getopt.c b/getopt.c
index db334c2..e9056a0 100644
--- a/getopt.c
+++ b/getopt.c
@@ -214,7 +214,8 @@ extern char *getenv ();
 #endif
 
 static char *
-my_index (str, chr)
+my_index (str,
+	  chr)
      const char *str;
      int chr;
 {
@@ -266,8 +267,8 @@ static char *const *original_argv;
 /* Make sure the environment variable bash 2.0 puts in the environment
    is valid for the getopt call we must make sure that the ARGV passed
    to getopt is that one passed to the process.  */
-static void
-  __attribute__ ((unused)) store_args_and_env (int argc, char *const *argv)
+static void __attribute__ ((unused)) store_args_and_env (int argc,
+							 char *const *argv)
 {
   /* XXX This is no good solution.  We should rather copy the args so
      that we can compare them later.  But we must not use malloc(3).  */
@@ -386,10 +387,14 @@ exchange (argv)
 /* Initialize the internal data when the first call is made.  */
 
 #if defined __STDC__ && __STDC__
-static const char *_getopt_initialize (int, char *const *, const char *);
+static const char *_getopt_initialize (int,
+				       char *const *,
+				       const char *);
 #endif
 static const char *
-_getopt_initialize (argc, argv, optstring)
+_getopt_initialize (argc,
+		    argv,
+		    optstring)
      int argc;
      char *const *argv;
      const char *optstring;
@@ -511,7 +516,12 @@ _getopt_initialize (argc, argv, optstring)
    long-named options.  */
 
 int
-_getopt_internal (argc, argv, optstring, longopts, longind, long_only)
+_getopt_internal (argc,
+		  argv,
+		  optstring,
+		  longopts,
+		  longind,
+		  long_only)
      int argc;
      char *const *argv;
      const char *optstring;
@@ -978,7 +988,9 @@ _getopt_internal (argc, argv, optstring, longopts, longind, long_only)
 }
 
 int
-getopt (argc, argv, optstring)
+getopt (argc,
+	argv,
+	optstring)
      int argc;
      char *const *argv;
      const char *optstring;
@@ -995,7 +1007,8 @@ getopt (argc, argv, optstring)
    the above definition of `getopt'.  */
 
 int
-main (argc, argv)
+main (argc,
+      argv)
      int argc;
      char **argv;
 {
diff --git a/getopt.h b/getopt.h
index 5f3a6c2..4a201a1 100644
--- a/getopt.h
+++ b/getopt.h
@@ -143,26 +143,32 @@ extern "C"
 /* Many other libraries have conflicting prototypes for getopt, with
    differences in the consts, in stdlib.h.  To avoid compilation
    errors, only prototype getopt for the GNU C library.  */
-  extern int getopt (int __argc, char *const *__argv,
+  extern int getopt (int __argc,
+		     char *const *__argv,
 		     const char *__shortopts);
 # else				/* not __GNU_LIBRARY__ */
   extern int getopt ();
 # endif				/* __GNU_LIBRARY__ */
 
 # ifndef __need_getopt
-  extern int getopt_long (int __argc, char *const *__argv,
+  extern int getopt_long (int __argc,
+			  char *const *__argv,
 			  const char *__shortopts,
-			  const struct option *__longopts, int *__longind);
-  extern int getopt_long_only (int __argc, char *const *__argv,
+			  const struct option *__longopts,
+			  int *__longind);
+  extern int getopt_long_only (int __argc,
+			       char *const *__argv,
 			       const char *__shortopts,
 			       const struct option *__longopts,
 			       int *__longind);
 
 /* Internal only.  Users should not call this directly.  */
-  extern int _getopt_internal (int __argc, char *const *__argv,
+  extern int _getopt_internal (int __argc,
+			       char *const *__argv,
 			       const char *__shortopts,
 			       const struct option *__longopts,
-			       int *__longind, int __long_only);
+			       int *__longind,
+			       int __long_only);
 # endif
 #else				/* not __STDC__ */
   extern int getopt ();
diff --git a/getopt1.c b/getopt1.c
index 442302b..ebbe828 100644
--- a/getopt1.c
+++ b/getopt1.c
@@ -64,7 +64,11 @@
 #endif
 
 int
-getopt_long (argc, argv, options, long_options, opt_index)
+getopt_long (argc,
+	     argv,
+	     options,
+	     long_options,
+	     opt_index)
      int argc;
      char *const *argv;
      const char *options;
@@ -80,7 +84,11 @@ getopt_long (argc, argv, options, long_options, opt_index)
    instead.  */
 
 int
-getopt_long_only (argc, argv, options, long_options, opt_index)
+getopt_long_only (argc,
+		  argv,
+		  options,
+		  long_options,
+		  opt_index)
      int argc;
      char *const *argv;
      const char *options;
@@ -98,7 +106,8 @@ getopt_long_only (argc, argv, options, long_options, opt_index)
 #include <stdio.h>
 
 int
-main (argc, argv)
+main (argc,
+      argv)
      int argc;
      char **argv;
 {
diff --git a/packtab.c b/packtab.c
index 486499a..9d9de51 100644
--- a/packtab.c
+++ b/packtab.c
@@ -54,7 +54,8 @@ init (int *base)
 }
 
 static int
-compare (const void *r, const void *s)
+compare (const void *r,
+	 const void *s)
 {
   int i;
   for (i = 0; i < cmpcluster; i++)
@@ -313,9 +314,15 @@ write_out ()
 }
 
 int
-pack_table (int *base, int key_num, int key_size,
-	    int p_max_depth, int p_tab_width, char **p_name,
-	    char *p_key_type_name, char *p_table_name, char *p_macro_name,
+pack_table (int *base,
+	    int key_num,
+	    int key_size,
+	    int p_max_depth,
+	    int p_tab_width,
+	    char **p_name,
+	    char *p_key_type_name,
+	    char *p_table_name,
+	    char *p_macro_name,
 	    FILE * out)
 {
   N = key_num;
diff --git a/packtab.h b/packtab.h
index 75bccfa..c68a6bf 100644
--- a/packtab.h
+++ b/packtab.h
@@ -29,10 +29,16 @@ extern "C"
 
 #define packtab_version 2
 
-  int pack_table
-    (int *base, int key_num, int key_size, int max_depth, int tab_width,
-     char **name, char *key_type_name, char *table_name, char *macro_name,
-     FILE * out);
+  int pack_table (int *base,
+		  int key_num,
+		  int key_size,
+		  int max_depth,
+		  int tab_width,
+		  char **name,
+		  char *key_type_name,
+		  char *table_name,
+		  char *macro_name,
+		  FILE * out);
 
 #ifdef	__cplusplus
 }