* help.h: Replace CHAR_BOLD_ON, CHAR_BOLD_OFF and CHAR_ITALIC_ON

with  CHAR_FONT_BOLD, CHAR_FONT_NORMAL and CHAR_FONT_ITALIC
respectively for better consistency.

src/ChangeLog

@@ -1,5 +1,9 @@
 2002-09-22  Pavel Roskin  <proski@gnu.org>
 
+	* help.h: Replace CHAR_BOLD_ON, CHAR_BOLD_OFF and CHAR_ITALIC_ON
+	with  CHAR_FONT_BOLD, CHAR_FONT_NORMAL and CHAR_FONT_ITALIC
+	respectively for better consistency.
+
 	* util.c (is_printable): Disable "Full 8 bits output" on xterm,
 	fall back to "ISO 8859-1" due to problems with gnome-terminal,
 	which identifies itself as xterm.

src/help.c

@@ -405,13 +405,13 @@ static void show (Dlg_head *h, char *paint_start)
 		addstr (VERSION);
 		col += strlen (VERSION);
 		break;
-	    case CHAR_BOLD_ON:
+	    case CHAR_FONT_BOLD:
 		attrset (HELP_BOLD_COLOR);
 		break;
-	    case CHAR_ITALIC_ON:
+	    case CHAR_FONT_ITALIC:
 		attrset (HELP_ITALIC_COLOR);
 		break;
-	    case CHAR_BOLD_OFF:
+	    case CHAR_FONT_NORMAL:
 		attrset (HELP_NORMAL_COLOR);
 		break;
 	    case '\n':

src/help.h

@@ -11,8 +11,8 @@
 #define CHAR_ALTERNATE		'\05'
 #define CHAR_NORMAL		'\06'
 #define CHAR_VERSION		'\07'
-#define CHAR_BOLD_ON		'\010'
-#define CHAR_BOLD_OFF		'\013'
+#define CHAR_FONT_BOLD		'\010'
+#define CHAR_FONT_NORMAL	'\013'
 #define CHAR_MCLOGO		'\014'
 #define CHAR_TEXTONLY_START	'\016'
 #define CHAR_TEXTONLY_END	'\017'
@@ -20,7 +20,7 @@
 #define CHAR_XONLY_END		'\021'
 #define CHAR_TITLE_ON		'\022'
 #define CHAR_TITLE_OFF		'\023'
-#define CHAR_ITALIC_ON		'\024'
+#define CHAR_FONT_ITALIC	'\024'
 #define CHAR_RESERVED		'\025'
 #define STRING_LINK_START	"\01"
 #define STRING_LINK_POINTER	"\02"

src/man2hlp.c

@@ -400,7 +400,7 @@ handle_command (char *buffer)
 	    return;
 	}
 
-	*buffer = (buffer[1] == 'I') ? CHAR_ITALIC_ON : CHAR_BOLD_ON;
+	*buffer = (buffer[1] == 'I') ? CHAR_FONT_ITALIC : CHAR_FONT_BOLD;
 
 	/* Attempt to handle backslash quoting */
 	for (w = &buffer[1]; *p; p++) {
@@ -412,7 +412,7 @@ handle_command (char *buffer)
 	    *w++ = *p;
 	}
 
-	*w++ = CHAR_BOLD_OFF;
+	*w++ = CHAR_FONT_NORMAL;
 	*w = 0;
 	print_string (buffer);
     } else if ((strcmp (buffer, ".TP") == 0)