Replaced tabs with spaces in source files.

5 files changed, 484 insertions, 484 deletions

diff --git a/cr/cr_cpri.h b/cr/cr_cpri.h
index e08c14f..c2999c5 100644
--- a/cr/cr_cpri.h
+++ b/cr/cr_cpri.h
@@ -14,15 +14,15 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- *	(C) Copyright Martial Bornet, 2015.
+ *   (C) Copyright Martial Bornet, 2015.
  *
- *	Auteur       :     Martial BORNET (MB) - 3 Janvier 2015
+ *   Auteur       :     Martial BORNET (MB) - 3 Janvier 2015
  *
- *	Description  :     Constantes privees
+ *   Description  :     Constantes privees
  *
- *	Fichier      :     cr_cpri.h
+ *   Fichier      :     cr_cpri.h
  *
- *	@(#)	cr_cpri.h	1.9	15/03/19	MB	
+ *   @(#)  cr_cpri.h  1.10  15/03/24  MB  
  *
  * ============================================================================
  */
@@ -34,99 +34,99 @@
 #include <sys/types.h>
 #include <regex.h>
 
-#define	bool						int
-#define	FALSE					(0)
-#define	TRUE						(1)
+#define   bool                          int
+#define   FALSE                         (0)
+#define   TRUE                          (1)
 
-#define	CR_NB_COLORS				(16)
+#define   CR_NB_COLORS                  (16)
 
 /* Numeros des couleurs
  * ~~~~~~~~~~~~~~~~~~~~ */
-#define	CR_BLACK					(0)
-#define	CR_RED					(1)
-#define	CR_GREEN					(2)
-#define	CR_YELLOW					(3)
-#define	CR_BLUE					(4)
-#define	CR_MAGENTA				(5)
-#define	CR_CYAN					(6)
-#define	CR_WHITE					(7)
-#define	CR_BLACK_REV				(8)
-#define	CR_RED_REV				(9)
-#define	CR_GREEN_REV				(10)
-#define	CR_YELLOW_REV				(11)
-#define	CR_BLUE_REV				(12)
-#define	CR_MAGENTA_REV				(13)
-#define	CR_CYAN_REV				(14)
-#define	CR_WHITE_REV				(15)
-
-#define	CR_C0					"black"
-#define	CR_C1					"red"
-#define	CR_C2					"green"
-#define	CR_C3					"yellow"
-#define	CR_C4					"blue"
-#define	CR_C5					"magenta"
-#define	CR_C6					"cyan"
-#define	CR_C7					"white"
-#define	CR_C8					"black reverse"
-#define	CR_C9					"red reverse"
-#define	CR_C10					"green reverse"
-#define	CR_C11					"yellow reverse"
-#define	CR_C12					"blue reverse"
-#define	CR_C13					"magenta reverse"
-#define	CR_C14					"cyan reverse"
-#define	CR_C15					"white reverse"
-
-#define	CR_INIT_COL(n)				{ G.color_RE[CR_COLOR_IDX(n)].col_name = CR_C ## n; \
-								  G.color_RE[CR_COLOR_IDX(n)].col_num  = (n % 8); }
+#define   CR_BLACK                      (0)
+#define   CR_RED                        (1)
+#define   CR_GREEN                      (2)
+#define   CR_YELLOW                     (3)
+#define   CR_BLUE                       (4)
+#define   CR_MAGENTA                    (5)
+#define   CR_CYAN                       (6)
+#define   CR_WHITE                      (7)
+#define   CR_BLACK_REV                  (8)
+#define   CR_RED_REV                    (9)
+#define   CR_GREEN_REV                  (10)
+#define   CR_YELLOW_REV                 (11)
+#define   CR_BLUE_REV                   (12)
+#define   CR_MAGENTA_REV                (13)
+#define   CR_CYAN_REV                   (14)
+#define   CR_WHITE_REV                  (15)
+
+#define   CR_C0                         "black"
+#define   CR_C1                         "red"
+#define   CR_C2                         "green"
+#define   CR_C3                         "yellow"
+#define   CR_C4                         "blue"
+#define   CR_C5                         "magenta"
+#define   CR_C6                         "cyan"
+#define   CR_C7                         "white"
+#define   CR_C8                         "black reverse"
+#define   CR_C9                         "red reverse"
+#define   CR_C10                        "green reverse"
+#define   CR_C11                        "yellow reverse"
+#define   CR_C12                        "blue reverse"
+#define   CR_C13                        "magenta reverse"
+#define   CR_C14                        "cyan reverse"
+#define   CR_C15                        "white reverse"
+
+#define   CR_INIT_COL(n)                { G.color_RE[CR_COLOR_IDX(n)].col_name = CR_C ## n; \
+                                          G.color_RE[CR_COLOR_IDX(n)].col_num  = (n % 8); }
 
 /* Indice de tableau d'une couleur
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-#define	CR_COLOR_IDX(color)			((color))
+#define   CR_COLOR_IDX(color)           ((color))
 
 #if 0
 /* Code des couleurs pour Linux ANSI
    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-#define	CR_CODE_LINUX(color)		((color) % 8) + 30)
+#define   CR_CODE_LINUX(color)          ((color) % 8) + 30)
 #endif
 
 /* Taille d'une ligne, nombre d'intervalles differents
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-#define	CR_SIZE					(1024)
+#define   CR_SIZE                       (1024)
 
 struct cr_RE {
-	regex_t						 reg;
-	char							*regex;
-	int							 cflags;
+     regex_t                             reg;
+     char                               *regex;
+     int                                 cflags;
 };
 
 struct cr_color {
-	bool							 used;
-	char							*col_name;
-	int							 col_num;
-	struct cr_RE					 RE;
-	int							 linux_code;
-	FILE							*out;
+     bool                                used;
+     char                               *col_name;
+     int                                 col_num;
+     struct cr_RE                        RE;
+     int                                 linux_code;
+     FILE                               *out;
 };
 
 struct cr_col_desc {
-	bool							 used;
-	struct cr_color				*col;
+     bool                                used;
+     struct cr_color                    *col;
 };
 
 struct cr_global {
-	char							*prgname;
-
-	struct cr_color				 color_RE[CR_NB_COLORS];
-	struct cr_color				*curr_col;
-	int							 cflags;
-	int							 list[CR_NB_COLORS];
-	int							 idx_list;
-	char							 line[CR_SIZE + 1];
-	struct cr_col_desc				 desc[CR_SIZE + 1];
-	int							 length;
-	bool							 debug;
-	bool							 disp_regex;
-	FILE							*out;
+     char                               *prgname;
+
+     struct cr_color                     color_RE[CR_NB_COLORS];
+     struct cr_color                    *curr_col;
+     int                                 cflags;
+     int                                 list[CR_NB_COLORS];
+     int                                 idx_list;
+     char                                line[CR_SIZE + 1];
+     struct cr_col_desc                  desc[CR_SIZE + 1];
+     int                                 length;
+     bool                                debug;
+     bool                                disp_regex;
+     FILE                               *out;
 };
 
-#endif	/* CR_CPRI_H */
+#endif    /* CR_CPRI_H */
diff --git a/cr/cr_epri.h b/cr/cr_epri.h
index ad1a064..eee4a52 100644
--- a/cr/cr_epri.h
+++ b/cr/cr_epri.h
@@ -14,15 +14,15 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- *	(C) Copyright Martial Bornet, 2015.
+ *   (C) Copyright Martial Bornet, 2015.
  *
- *	Auteur       :     Martial BORNET (MB) - 3 Janvier 2015
+ *   Auteur       :     Martial BORNET (MB) - 3 Janvier 2015
  *
- *	Description  :     Externes privees
+ *   Description  :     Externes privees
  *
- *	Fichier      :     cr_epri.h
+ *   Fichier      :     cr_epri.h
  *
- *	@(#)	cr_epri.h	1.7	15/03/19	MB	
+ *   @(#)  cr_epri.h  1.8  15/03/24  MB  
  *
  * ============================================================================
  */
@@ -32,21 +32,21 @@
 
 #include "cr_cpri.h"
 
-extern struct cr_global							G;
+extern struct cr_global                                G;
 
 /* Fonctions
  * ~~~~~~~~~ */
-void								 cr_usage(void);
-void								 cr_init_list(void);
-void								 cr_init_col_names(void);
-void								 cr_set_color(int, char *);
-void								 cr_free_RE(void);
-void								 cr_read_input(void);
-void								 cr_disp_color(int, char *);
-void								 cr_start_color(struct cr_color *, int);
-void								 cr_end_color(struct cr_color *);
-void								 cr_init_desc(void);
-void								 cr_set_desc(struct cr_color *, int, int, int);
-void								 cr_disp_line(void);
+void                                     cr_usage(void);
+void                                     cr_init_list(void);
+void                                     cr_init_col_names(void);
+void                                     cr_set_color(int, char *);
+void                                     cr_free_RE(void);
+void                                     cr_read_input(void);
+void                                     cr_disp_color(int, char *);
+void                                     cr_start_color(struct cr_color *, int);
+void                                     cr_end_color(struct cr_color *);
+void                                     cr_init_desc(void);
+void                                     cr_set_desc(struct cr_color *, int, int, int);
+void                                     cr_disp_line(void);
 
-#endif	/* CR_EPRI_H */
+#endif    /* CR_EPRI_H */
diff --git a/cr/cr_gpri.c b/cr/cr_gpri.c
index 70acea8..c68691d 100644
--- a/cr/cr_gpri.c
+++ b/cr/cr_gpri.c
@@ -14,20 +14,20 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- *	(C) Copyright Martial Bornet, 2015.
+ *   (C) Copyright Martial Bornet, 2015.
  *
- *	Auteur       :     Martial BORNET (MB) - 3 Janvier 2015
+ *   Auteur       :     Martial BORNET (MB) - 3 Janvier 2015
  *
- *	Description  :     Globales privees
+ *   Description  :     Globales privees
  *
- *	Fichier      :     cr_gpri.c
+ *   Fichier      :     cr_gpri.c
  *
- *	@(#)	cr_gpri.c	1.3	15/03/14	MB	
+ *   @(#)  cr_gpri.c  1.4  15/03/24  MB  
  *
  * ============================================================================
  */
 
 #include "cr_epri.h"
 
-struct cr_global							G		= { 0 };
+struct cr_global                                  G         = { 0 };
 
diff --git a/cr/cr_main.c b/cr/cr_main.c
index 660551d..7ef83a5 100644
--- a/cr/cr_main.c
+++ b/cr/cr_main.c
@@ -14,27 +14,27 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- *	Auteur       :     Martial BORNET (MB) - 3 Janvier 2015
+ *   Auteur       :     Martial BORNET (MB) - 3 Janvier 2015
  *
- *	Description  :     Programme de colorisation  de chaines
+ *   Description  :     Programme de colorisation  de chaines
  *
- *	Fichier      :     cr_main.c
+ *   Fichier      :     cr_main.c
  *
- *	@(#)	cr_main.c	1.21	15/03/19	MB	
+ *   @(#)  cr_main.c  1.22  15/03/24  MB  
  *
- *	Liste des fonctions de ce fichier :
- *	~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- *	- main
- *	- cr_usage
- *	- cr_init_list
- *	- cr_init_col_names
- *	- cr_set_color
- *	- cr_read_input
- *	- cr_start_color
- *	- cr_end_color
- *	- cr_init_desc
- *	- cr_set_desc
- *	- cr_disp_line
+ *   Liste des fonctions de ce fichier :
+ *   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ *   - main
+ *   - cr_usage
+ *   - cr_init_list
+ *   - cr_init_col_names
+ *   - cr_set_color
+ *   - cr_read_input
+ *   - cr_start_color
+ *   - cr_end_color
+ *   - cr_init_desc
+ *   - cr_set_desc
+ *   - cr_disp_line
  * ============================================================================
  */
 
@@ -46,474 +46,474 @@
 
 #include "cr_epri.h"
 
-#define	X			 fprintf(stderr, "%s(%d)\n", __FILE__, __LINE__);
+#define   X               fprintf(stderr, "%s(%d)\n", __FILE__, __LINE__);
 
 /******************************************************************************
 
-						MAIN
+                              MAIN
 
 ******************************************************************************/
 int main(int argc, char *argv[])
 {
-	int					 _opt, _i;
-	struct cr_color		*_col;
+     int                       _opt, _i;
+     struct cr_color          *_col;
 
-	G.prgname		= argv[0];
-	G.out		= stdout;
+     G.prgname      = argv[0];
+     G.out          = stdout;
 
-	if (argc == 1) {
-		cr_usage();
-	}
-
-	cr_init_list();
-	cr_init_col_names();
-
-	/* Analyse des arguments
-	   ~~~~~~~~~~~~~~~~~~~~~ */
-	while ((_opt = getopt(argc, argv, "huvEr:g:y:b:m:c:w:R:G:Y:B:M:C:W:Ddei")) != -1) {
-		switch (_opt) {
-		case 'h':
-			cr_usage();
-			break;
-
-		case	'E':
-			G.out		= stderr;
-			break;
-
-		case 'd' :
-			G.debug		= TRUE;
-			break;
-
-		case	'D' :
-			G.disp_regex	= TRUE;
-			break;
-
-		case	'r':
-			cr_set_color(CR_RED, optarg);
-			break;
-
-		case	'g':
-			cr_set_color(CR_GREEN, optarg);
-			break;
-
-		case	'y':
-			cr_set_color(CR_YELLOW, optarg);
-			break;
-
-		case 'b':
-			cr_set_color(CR_BLUE, optarg);
-			break;
-
-		case	'm':
-			cr_set_color(CR_MAGENTA, optarg);
-			break;
-
-		case	'c':
-			cr_set_color(CR_CYAN, optarg);
-			break;
-
-		case	'w':
-			cr_set_color(CR_WHITE, optarg);
-			break;
-
-		case	'R':
-			cr_set_color(CR_RED_REV, optarg);
-			break;
-
-		case	'G':
-			cr_set_color(CR_GREEN_REV, optarg);
-			break;
-
-		case	'Y':
-			cr_set_color(CR_YELLOW_REV, optarg);
-			break;
-
-		case 'B':
-			cr_set_color(CR_BLUE_REV, optarg);
-			break;
-
-		case	'M':
-			cr_set_color(CR_MAGENTA_REV, optarg);
-			break;
-
-		case	'C':
-			cr_set_color(CR_CYAN_REV, optarg);
-			break;
-
-		case	'W':
-			cr_set_color(CR_WHITE_REV, optarg);
-			break;
-
-		case 'e':
-			G.cflags	|= REG_EXTENDED;
-			break;
-
-		case 'i':
-			G.cflags	|= REG_ICASE;
-			break;
-
-		case	'u':
-			setvbuf(stdout, (char *) 0, _IONBF, 0);
-			break;
-
-		case	'v':
-			fprintf(stderr, "%s: version %s\n", G.prgname, "1.21");
-			exit(1);
-			break;
-
-		default:
-			fprintf(stderr, "%s: unknown option '%c' !\n", G.prgname, _opt);
-			cr_usage();
-			break;
-		}
-	}
-//	G.cflags	|= REG_NEWLINE;
-
-	if (G.disp_regex) {
-		for (_i = 0; _i < G.idx_list; _i++) {
-			_col			= &G.color_RE[G.list[_i]];
-			printf("[%2d] ", _i + 1);
-			cr_start_color(NULL, _col->col_num);
-			printf("%s\n", _col->RE.regex);
-			cr_end_color(NULL);
-		}
-	}
-
-	cr_read_input();
-
-	cr_free_RE();
-	return 0;
+     if (argc == 1) {
+          cr_usage();
+     }
+
+     cr_init_list();
+     cr_init_col_names();
+
+     /* Analyse des arguments
+        ~~~~~~~~~~~~~~~~~~~~~ */
+     while ((_opt = getopt(argc, argv, "huvEr:g:y:b:m:c:w:R:G:Y:B:M:C:W:Ddei")) != -1) {
+          switch (_opt) {
+          case 'h':
+               cr_usage();
+               break;
+
+          case 'E':
+               G.out          = stderr;
+               break;
+
+          case 'd' :
+               G.debug        = TRUE;
+               break;
+
+          case 'D' :
+               G.disp_regex   = TRUE;
+               break;
+
+          case 'r':
+               cr_set_color(CR_RED, optarg);
+               break;
+
+          case 'g':
+               cr_set_color(CR_GREEN, optarg);
+               break;
+
+          case 'y':
+               cr_set_color(CR_YELLOW, optarg);
+               break;
+
+          case 'b':
+               cr_set_color(CR_BLUE, optarg);
+               break;
+
+          case 'm':
+               cr_set_color(CR_MAGENTA, optarg);
+               break;
+
+          case 'c':
+               cr_set_color(CR_CYAN, optarg);
+               break;
+
+          case 'w':
+               cr_set_color(CR_WHITE, optarg);
+               break;
+
+          case 'R':
+               cr_set_color(CR_RED_REV, optarg);
+               break;
+
+          case 'G':
+               cr_set_color(CR_GREEN_REV, optarg);
+               break;
+
+          case 'Y':
+               cr_set_color(CR_YELLOW_REV, optarg);
+               break;
+
+          case 'B':
+               cr_set_color(CR_BLUE_REV, optarg);
+               break;
+
+          case 'M':
+               cr_set_color(CR_MAGENTA_REV, optarg);
+               break;
+
+          case 'C':
+               cr_set_color(CR_CYAN_REV, optarg);
+               break;
+
+          case 'W':
+               cr_set_color(CR_WHITE_REV, optarg);
+               break;
+
+          case 'e':
+               G.cflags  |= REG_EXTENDED;
+               break;
+
+          case 'i':
+               G.cflags  |= REG_ICASE;
+               break;
+
+          case 'u':
+               setvbuf(stdout, (char *) 0, _IONBF, 0);
+               break;
+
+          case 'v':
+               fprintf(stderr, "%s: version %s\n", G.prgname, "1.22");
+               exit(1);
+               break;
+
+          default:
+               fprintf(stderr, "%s: unknown option '%c' !\n", G.prgname, _opt);
+               cr_usage();
+               break;
+          }
+     }
+//   G.cflags  |= REG_NEWLINE;
+
+     if (G.disp_regex) {
+          for (_i = 0; _i < G.idx_list; _i++) {
+               _col           = &G.color_RE[G.list[_i]];
+               printf("[%2d] ", _i + 1);
+               cr_start_color(NULL, _col->col_num);
+               printf("%s\n", _col->RE.regex);
+               cr_end_color(NULL);
+          }
+     }
+
+     cr_read_input();
+
+     cr_free_RE();
+     return 0;
 }
 
 /******************************************************************************
 
-					CR_USAGE
+                         CR_USAGE
 
 ******************************************************************************/
 void cr_usage(void)
 {
-	fprintf(stderr, "%s: version %s\n", G.prgname, "1.21");
-	fprintf(stderr, "Usage: %s [-h|-eidD][-E][-rgybmcwRGYBMCW] regexp ...\n", G.prgname);
-	fprintf(stderr, "  -h : help\n");
-	fprintf(stderr, "  -v : version\n");
-	fprintf(stderr, "  -u : do not bufferize output on stdout\n");
-	fprintf(stderr, "  -e : extended regular expressions\n");
-	fprintf(stderr, "  -i : ignore case\n");
-	fprintf(stderr, "  -E : print on stderr\n");
-	fprintf(stderr, "  -r : red\n");
-	fprintf(stderr, "  -g : green\n");
-	fprintf(stderr, "  -y : yellow\n");
-	fprintf(stderr, "  -b : blue\n");
-	fprintf(stderr, "  -m : magenta\n");
-	fprintf(stderr, "  -c : cyan\n");
-	fprintf(stderr, "  -w : white\n");
-	fprintf(stderr, "  -R : red     (reverse video)\n");
-	fprintf(stderr, "  -G : green   (reverse video)\n");
-	fprintf(stderr, "  -Y : yellow  (reverse video)\n");
-	fprintf(stderr, "  -B : blue    (reverse video)\n");
-	fprintf(stderr, "  -M : magenta (reverse video)\n");
-	fprintf(stderr, "  -C : cyan    (reverse video)\n");
-	fprintf(stderr, "  -W : white   (reverse video)\n");
-	fprintf(stderr, "  -d : debug\n");
-	fprintf(stderr, "  -D : display regular expressions\n");
-	exit(1);
+     fprintf(stderr, "%s: version %s\n", G.prgname, "1.22");
+     fprintf(stderr, "Usage: %s [-h|-eidD][-E][-rgybmcwRGYBMCW] regexp ...\n", G.prgname);
+     fprintf(stderr, "  -h : help\n");
+     fprintf(stderr, "  -v : version\n");
+     fprintf(stderr, "  -u : do not bufferize output on stdout\n");
+     fprintf(stderr, "  -e : extended regular expressions\n");
+     fprintf(stderr, "  -i : ignore case\n");
+     fprintf(stderr, "  -E : print on stderr\n");
+     fprintf(stderr, "  -r : red\n");
+     fprintf(stderr, "  -g : green\n");
+     fprintf(stderr, "  -y : yellow\n");
+     fprintf(stderr, "  -b : blue\n");
+     fprintf(stderr, "  -m : magenta\n");
+     fprintf(stderr, "  -c : cyan\n");
+     fprintf(stderr, "  -w : white\n");
+     fprintf(stderr, "  -R : red     (reverse video)\n");
+     fprintf(stderr, "  -G : green   (reverse video)\n");
+     fprintf(stderr, "  -Y : yellow  (reverse video)\n");
+     fprintf(stderr, "  -B : blue    (reverse video)\n");
+     fprintf(stderr, "  -M : magenta (reverse video)\n");
+     fprintf(stderr, "  -C : cyan    (reverse video)\n");
+     fprintf(stderr, "  -W : white   (reverse video)\n");
+     fprintf(stderr, "  -d : debug\n");
+     fprintf(stderr, "  -D : display regular expressions\n");
+     exit(1);
 }
 
 /******************************************************************************
 
-					CR_INIT_LIST
+                         CR_INIT_LIST
 
 ******************************************************************************/
 void cr_init_list(void)
 {
-	int					 _i;
+     int                       _i;
 
-	for (_i = 0; _i < CR_NB_COLORS; _i++) {
-		G.list[_i]	= -1;
-	}
-	G.idx_list	= 0;
+     for (_i = 0; _i < CR_NB_COLORS; _i++) {
+          G.list[_i]     = -1;
+     }
+     G.idx_list     = 0;
 }
 
 /******************************************************************************
 
-					CR_INIT_COL_NAMES
+                         CR_INIT_COL_NAMES
 
 ******************************************************************************/
 void cr_init_col_names(void)
 {
-	CR_INIT_COL(0);
-	CR_INIT_COL(1);
-	CR_INIT_COL(2);
-	CR_INIT_COL(3);
-	CR_INIT_COL(4);
-	CR_INIT_COL(5);
-	CR_INIT_COL(6);
-	CR_INIT_COL(7);
-	CR_INIT_COL(8);
-	CR_INIT_COL(9);
-	CR_INIT_COL(10);
-	CR_INIT_COL(11);
-	CR_INIT_COL(12);
-	CR_INIT_COL(13);
-	CR_INIT_COL(14);
-	CR_INIT_COL(15);
+     CR_INIT_COL(0);
+     CR_INIT_COL(1);
+     CR_INIT_COL(2);
+     CR_INIT_COL(3);
+     CR_INIT_COL(4);
+     CR_INIT_COL(5);
+     CR_INIT_COL(6);
+     CR_INIT_COL(7);
+     CR_INIT_COL(8);
+     CR_INIT_COL(9);
+     CR_INIT_COL(10);
+     CR_INIT_COL(11);
+     CR_INIT_COL(12);
+     CR_INIT_COL(13);
+     CR_INIT_COL(14);
+     CR_INIT_COL(15);
 }
 
 /******************************************************************************
 
-					CR_SET_COLOR
+                         CR_SET_COLOR
 
 ******************************************************************************/
 void cr_set_color(int color, char *regexp)
 {
-	int					 _idx;
-	struct cr_color		*_col;
-
-	_idx			= CR_COLOR_IDX(color);
-
-	_col			= &G.color_RE[_idx];
-
-	if (_col->used) {
-		/* Couleur deja specifiee
-		   ~~~~~~~~~~~~~~~~~~~~~~ */
-		fprintf(stderr, "%s: duplicated color (%s)\n", G.prgname, _col->col_name);
-		exit(1);
-	}
-	G.list[G.idx_list++]	= _idx;
-
-	_col->used			= TRUE;
-	_col->col_num			= color;
-	_col->RE.cflags		= G.cflags;
-	_col->RE.regex			= regexp;
-	_col->out				= G.out;
-	G.out				= stdout;
-
-	if (regcomp(&_col->RE.reg, regexp, _col->RE.cflags) != 0) {
-		fprintf(stderr, "%s: regcomp error for \"%s\" !\n", G.prgname, regexp);
-		exit(1);
-	}
+     int                       _idx;
+     struct cr_color          *_col;
+
+     _idx           = CR_COLOR_IDX(color);
+
+     _col           = &G.color_RE[_idx];
+
+     if (_col->used) {
+          /* Couleur deja specifiee
+             ~~~~~~~~~~~~~~~~~~~~~~ */
+          fprintf(stderr, "%s: duplicated color (%s)\n", G.prgname, _col->col_name);
+          exit(1);
+     }
+     G.list[G.idx_list++]     = _idx;
+
+     _col->used               = TRUE;
+     _col->col_num            = color;
+     _col->RE.cflags          = G.cflags;
+     _col->RE.regex           = regexp;
+     _col->out                = G.out;
+     G.out                    = stdout;
+
+     if (regcomp(&_col->RE.reg, regexp, _col->RE.cflags) != 0) {
+          fprintf(stderr, "%s: regcomp error for \"%s\" !\n", G.prgname, regexp);
+          exit(1);
+     }
 }
 
 /******************************************************************************
 
-					CR_FREE_RE
+                         CR_FREE_RE
 
 ******************************************************************************/
 void cr_free_RE(void)
 {
-	int					 _i;
-	regex_t				*_reg;
-
-	for (_i = 0; _i < CR_NB_COLORS; _i++) {
-		_reg		= &G.color_RE[_i].RE.reg;
-		if (_reg) {
-			regfree(_reg);
-		}
-	}
+     int                       _i;
+     regex_t                  *_reg;
+
+     for (_i = 0; _i < CR_NB_COLORS; _i++) {
+          _reg      = &G.color_RE[_i].RE.reg;
+          if (_reg) {
+               regfree(_reg);
+          }
+     }
 }
 /******************************************************************************
 
-					CR_READ_INPUT
+                         CR_READ_INPUT
 
 ******************************************************************************/
 void cr_read_input(void)
 {
-	int					 _i, _j, _n, _s = 0, _e = 0, _off;
-	struct cr_color		*_col;
-	size_t				 _nmatch;
-	regmatch_t			 _pmatch[CR_SIZE + 1];
-	int					 _eflags = 0;
-
-	char					 _debug_str[CR_SIZE + 1];
-
-	_nmatch		= sizeof(_pmatch) / sizeof(_pmatch[0]);
-
-	for (_n = sizeof(G.line); fgets(G.line, _n, stdin) != 0; _n = sizeof(G.line)) {
-		/* Reinitialisation des descripteurs de couleurs
-		   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-		cr_init_desc();
-
-		G.length		= strlen(G.line);
-
-		for (_i = 0; _i < G.idx_list; _i++) {
-			_col			= &G.color_RE[G.list[_i]];
-
-			for (_off = 0;  regexec(&_col->RE.reg, G.line + _off, _nmatch, _pmatch, _eflags) == 0; _off += _e + 1) {
-				if (G.debug) {
-					fprintf(stderr, "LINE : [%s] :\n", G.line + _off);
-				}
-
-				for (_j = 0; _pmatch[_j].rm_so != -1; _j++) {
-					_s	= _pmatch[_j].rm_so;
-					_e	= _pmatch[_j].rm_eo - 1;
-
-					if (G.debug) {
-						strncpy(_debug_str, G.line + _off + _s, _e - _s + 1);
-						_debug_str[_e -_s + 1]	= 0;
-						fprintf(stderr, "OFFSET = %3d : %3d => %3d [%s] [%s]\n", _off, _s, _e, _col->RE.regex, _debug_str);
-					}
-
-					cr_set_desc(_col, _off, _s, _e);
-				}
-
-				/* Pour traiter les chaines vides
-				   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-				if (_e < 0) {
-					fprintf(stderr, "%s: warning : empty match !\n", G.prgname);
-					exit(1);
-//					break;
-				}
-			}
-		}
-
-		cr_disp_line();
-	}
-
-	exit(1);
+     int                       _i, _j, _n, _s = 0, _e = 0, _off;
+     struct cr_color          *_col;
+     size_t                    _nmatch;
+     regmatch_t                _pmatch[CR_SIZE + 1];
+     int                       _eflags = 0;
+
+     char                      _debug_str[CR_SIZE + 1];
+
+     _nmatch        = sizeof(_pmatch) / sizeof(_pmatch[0]);
+
+     for (_n = sizeof(G.line); fgets(G.line, _n, stdin) != 0; _n = sizeof(G.line)) {
+          /* Reinitialisation des descripteurs de couleurs
+             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+          cr_init_desc();
+
+          G.length       = strlen(G.line);
+
+          for (_i = 0; _i < G.idx_list; _i++) {
+               _col           = &G.color_RE[G.list[_i]];
+
+               for (_off = 0;  regexec(&_col->RE.reg, G.line + _off, _nmatch, _pmatch, _eflags) == 0; _off += _e + 1) {
+                    if (G.debug) {
+                         fprintf(stderr, "LINE : [%s] :\n", G.line + _off);
+                    }
+
+                    for (_j = 0; _pmatch[_j].rm_so != -1; _j++) {
+                         _s   = _pmatch[_j].rm_so;
+                         _e   = _pmatch[_j].rm_eo - 1;
+
+                         if (G.debug) {
+                              strncpy(_debug_str, G.line + _off + _s, _e - _s + 1);
+                              _debug_str[_e -_s + 1]   = 0;
+                              fprintf(stderr, "OFFSET = %3d : %3d => %3d [%s] [%s]\n", _off, _s, _e, _col->RE.regex, _debug_str);
+                         }
+
+                         cr_set_desc(_col, _off, _s, _e);
+                    }
+
+                    /* Pour traiter les chaines vides
+                       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+                    if (_e < 0) {
+                         fprintf(stderr, "%s: warning : empty match !\n", G.prgname);
+                         exit(1);
+//                       break;
+                    }
+               }
+          }
+
+          cr_disp_line();
+     }
+
+     exit(1);
 }
 
 /******************************************************************************
 
-					CR_START_COLOR
+                         CR_START_COLOR
 
 ******************************************************************************/
 void cr_start_color(struct cr_color *col, int color)
 {
-	FILE					*_out;
-
-	if (col)	_out = col->out;
-	else		_out = stdout;
-
-	if (color > CR_WHITE) {
-		/* Reverse video
-		   ~~~~~~~~~~~~~ */
-		fprintf(_out, "\033[01;30m\033[01;%dm", 40 + (color - 8));
-	}
-	else {
-		/* Normal video
-		   ~~~~~~~~~~~~ */
-		fprintf(_out, "\033[01;%dm", 30 + color);
-	}
+     FILE                     *_out;
+
+     if (col)  _out = col->out;
+     else      _out = stdout;
+
+     if (color > CR_WHITE) {
+          /* Reverse video
+             ~~~~~~~~~~~~~ */
+          fprintf(_out, "\033[01;30m\033[01;%dm", 40 + (color - 8));
+     }
+     else {
+          /* Normal video
+             ~~~~~~~~~~~~ */
+          fprintf(_out, "\033[01;%dm", 30 + color);
+     }
 }
 
 /******************************************************************************
 
-					CR_END_COLOR
+                         CR_END_COLOR
 
 ******************************************************************************/
 void cr_end_color(struct cr_color *col)
 {
-	FILE					*_out;
+     FILE                     *_out;
 
-	if (col)	_out = col->out;
-	else		_out = stdout;
+     if (col)  _out = col->out;
+     else      _out = stdout;
 
-	fprintf(_out, "\033[0m");
+     fprintf(_out, "\033[0m");
 }
 
 /******************************************************************************
 
-					CR_INIT_DESC
+                         CR_INIT_DESC
 
 ******************************************************************************/
 void cr_init_desc(void)
 {
-	struct cr_col_desc		*_desc;
+     struct cr_col_desc       *_desc;
 
-	G.length		= 0;
+     G.length       = 0;
 
-	for (_desc = G.desc; _desc < (&G.desc[sizeof(G.desc) / sizeof(G.desc[0])]);  _desc++) {
-		_desc->col		= NULL;
-		_desc->used		= FALSE;
-	}
+     for (_desc = G.desc; _desc < (&G.desc[sizeof(G.desc) / sizeof(G.desc[0])]);  _desc++) {
+          _desc->col          = NULL;
+          _desc->used         = FALSE;
+     }
 }
 
 /******************************************************************************
 
-					CR_SET_DESC
+                         CR_SET_DESC
 
 ******************************************************************************/
 void cr_set_desc(struct cr_color *col, int offset, int s, int e)
 {
-	int			 	 _i;
-	struct cr_col_desc	*_desc;
-
-	for (_i = s, _desc = &G.desc[offset + s]; _i <= e; _i++, _desc++) {
-		if (!_desc->used) {
-			_desc->used	= TRUE;
-			_desc->col	= col;
-		}
-	}
+     int                  _i;
+     struct cr_col_desc  *_desc;
+
+     for (_i = s, _desc = &G.desc[offset + s]; _i <= e; _i++, _desc++) {
+          if (!_desc->used) {
+               _desc->used    = TRUE;
+               _desc->col     = col;
+          }
+     }
 }
 
 /******************************************************************************
 
-					CR_DISP_LINE
+                         CR_DISP_LINE
 
 ******************************************************************************/
 void cr_disp_line(void)
 {
-	int			 	 _i;
-	struct cr_col_desc	*_desc;
-
-	for (_i = 0, _desc = G.desc; _i < G.length; _i++, _desc++) {
-		if (G.line[_i] == '\n') {
-			if (G.curr_col) {
-				cr_end_color(G.curr_col);
-				putc(G.line[_i], G.curr_col->out);
-			}
-			else {
-				putc(G.line[_i], stdout);
-			}
-		}
-		else if (_desc->used) {
-			/* Le caractere est en couleur
-			   ~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-			if (G.curr_col == NULL) {
-				/* Le caractere precedent n'etait pas en couleur
-				   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-				cr_start_color(_desc->col, _desc->col->col_num);
-				putc(G.line[_i], _desc->col->out);
-			}
-			else {
-				/* Le caractere precedent etait en couleur
-				   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-				if (_desc-> col == G.curr_col) {
-					/* Pas de changement de couleur
-					   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-					putc(G.line[_i], G.curr_col->out);
-				}
-				else {
-					/* Changement de couleur
-					   ~~~~~~~~~~~~~~~~~~~~~ */
-					cr_end_color(G.curr_col);
-					cr_start_color(_desc->col, _desc->col->col_num);
-					putc(G.line[_i], _desc->col->out);
-				}
-			}
-		}
-		else {
-			/* Le caractere n'est pas en couleur
-			   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-			if (G.curr_col == NULL) {
-				/* Le caractere precedent n'etait pas en couleur
-				   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-				putc(G.line[_i], stdout);
-			}
-			else {
-				/* Le caractere precedent etait en couleur
-				   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-				cr_end_color(G.curr_col);
-				putc(G.line[_i], G.curr_col->out);
-			}
-		}
-		G.curr_col	= _desc->col;
-		if (G.line[_i] == '\n') {
-			G.curr_col	= NULL;
-		}
-	}
-	_desc--;
-	if (_desc->used) {
-		cr_end_color(G.curr_col);
-	}
+     int                  _i;
+     struct cr_col_desc  *_desc;
+
+     for (_i = 0, _desc = G.desc; _i < G.length; _i++, _desc++) {
+          if (G.line[_i] == '\n') {
+               if (G.curr_col) {
+                    cr_end_color(G.curr_col);
+                    putc(G.line[_i], G.curr_col->out);
+               }
+               else {
+                    putc(G.line[_i], stdout);
+               }
+          }
+          else if (_desc->used) {
+               /* Le caractere est en couleur
+                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+               if (G.curr_col == NULL) {
+                    /* Le caractere precedent n'etait pas en couleur
+                       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+                    cr_start_color(_desc->col, _desc->col->col_num);
+                    putc(G.line[_i], _desc->col->out);
+               }
+               else {
+                    /* Le caractere precedent etait en couleur
+                       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+                    if (_desc-> col == G.curr_col) {
+                         /* Pas de changement de couleur
+                            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+                         putc(G.line[_i], G.curr_col->out);
+                    }
+                    else {
+                         /* Changement de couleur
+                            ~~~~~~~~~~~~~~~~~~~~~ */
+                         cr_end_color(G.curr_col);
+                         cr_start_color(_desc->col, _desc->col->col_num);
+                         putc(G.line[_i], _desc->col->out);
+                    }
+               }
+          }
+          else {
+               /* Le caractere n'est pas en couleur
+                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+               if (G.curr_col == NULL) {
+                    /* Le caractere precedent n'etait pas en couleur
+                       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+                    putc(G.line[_i], stdout);
+               }
+               else {
+                    /* Le caractere precedent etait en couleur
+                       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+                    cr_end_color(G.curr_col);
+                    putc(G.line[_i], G.curr_col->out);
+               }
+          }
+          G.curr_col     = _desc->col;
+          if (G.line[_i] == '\n') {
+               G.curr_col     = NULL;
+          }
+     }
+     _desc--;
+     if (_desc->used) {
+          cr_end_color(G.curr_col);
+     }
 }
diff --git a/cr/hl b/cr/hl
index f77f4b7..34d250b 100755
--- a/cr/hl
+++ b/cr/hl