diff options
author | ru <ru@FreeBSD.org> | 2002-10-11 08:52:17 +0000 |
---|---|---|
committer | ru <ru@FreeBSD.org> | 2002-10-11 08:52:17 +0000 |
commit | 127e61728bacf1fb90edd8be1b0c406619e78bc8 (patch) | |
tree | 8c45b0385e4d4d3172ddd7926de65d06c5b2e88b /contrib/groff/src/devices/grotty | |
parent | 737a9b93ec94c55fd85de176c9de9302f1a9f95f (diff) | |
download | FreeBSD-src-127e61728bacf1fb90edd8be1b0c406619e78bc8.zip FreeBSD-src-127e61728bacf1fb90edd8be1b0c406619e78bc8.tar.gz |
Virgin import of FSF groff v1.18.1
Diffstat (limited to 'contrib/groff/src/devices/grotty')
-rw-r--r-- | contrib/groff/src/devices/grotty/Makefile.sub | 4 | ||||
-rw-r--r-- | contrib/groff/src/devices/grotty/grotty.man | 227 | ||||
-rw-r--r-- | contrib/groff/src/devices/grotty/tty.cc | 319 |
3 files changed, 472 insertions, 78 deletions
diff --git a/contrib/groff/src/devices/grotty/Makefile.sub b/contrib/groff/src/devices/grotty/Makefile.sub index 91d3908..8802674 100644 --- a/contrib/groff/src/devices/grotty/Makefile.sub +++ b/contrib/groff/src/devices/grotty/Makefile.sub @@ -1,6 +1,6 @@ -PROG=grotty +PROG=grotty$(EXEEXT) MAN1=grotty.n XLIBS=$(LIBDRIVER) $(LIBGROFF) MLIB=$(LIBM) -OBJS=tty.o +OBJS=tty.$(OBJEXT) CCSRCS=$(srcdir)/tty.cc diff --git a/contrib/groff/src/devices/grotty/grotty.man b/contrib/groff/src/devices/grotty/grotty.man index 4f23ca0..da5f944 100644 --- a/contrib/groff/src/devices/grotty/grotty.man +++ b/contrib/groff/src/devices/grotty/grotty.man @@ -1,5 +1,5 @@ .ig -Copyright (C) 1989-2000, 2001 Free Software Foundation, Inc. +Copyright (C) 1989-2000, 2001, 2002 Free Software Foundation, Inc. Permission is granted to make and distribute verbatim copies of this manual provided the copyright notice and this permission notice @@ -16,22 +16,28 @@ versions, except that this permission notice may be included in translations approved by the Free Software Foundation instead of in the original English. .. +. +. .TH GROTTY @MAN1EXT@ "@MDATE@" "Groff Version @VERSION@" .SH NAME grotty \- groff driver for typewriter-like devices +. +. .SH SYNOPSIS .B grotty [ -.B \-hfbuodBUv +.B \-bBcdfhiouUv ] [ .BI \-F dir ] [ -.IR files \|.\|.\|. +.IR files \|.\|.\|.\& ] .PP It is possible to have whitespace between the .B \-F option and its parameter. +. +. .SH DESCRIPTION .B grotty translates the output of GNU @@ -49,6 +55,8 @@ or .B \-Tutf8 option on ASCII based systems, and with .B \-Tcp1047 +and +.B \-Tutf8 on EBCDIC based hosts. If no files are given, .B grotty @@ -60,21 +68,75 @@ will also cause to read the standard input. Output is written to the standard output. .LP -Normally +By default, .B grotty -prints a bold character +emits SGR escape sequences (from ISO 6429, also called ANSI color escapes) +to change text attributes (bold, italic, colors). +This makes it possible to have eight different \M[green]background\M[] +and \m[red]foreground\m[] colors; additionally, bold and italic +attributes can be used \f[BI]at the same time\f[] (by using the BI font). +.LP +The following colors are defined in +.BR tty.tmac : +black, white, red, green, blue, yellow, magenta, cyan. +Unknown colors are mapped to the default color (which is dependent on the +settings of the terminal; in most cases, this is black for the foreground +and white for the background). +.LP +Use the +.B \-c +switch to revert to the old behaviour, printing a bold character .I c -using the sequence +with the sequence .RI ` c .SM BACKSPACE .IR c ' -and a italic character +and an italic character .I c by the sequence .RB ` _ .SM BACKSPACE .IR c '. -These sequences can be displayed on a terminal +At the same time, color output is disabled. +The same effect can be achieved by setting either the +.B GROFF_NO_SGR +environment variable or using the `sgr' X command (see below). +.LP +For SGR support, it is necessary to use the +.B \-R +option of +.BR less (1) +to disable the interpretation of +.BR grotty 's +old output format. +Consequently, all programs which use +.B less +as the pager program have to pass this option to it. +For +.BR man (1) +in particular, either add +.B \-R +to the +.B $PAGER +environment variable, e.g.\& +.RS +.LP +.B PAGER="/usr/bin/less -R" +.br +.B export PAGER +.RE +.LP +or use the +.B \-P +option of +.B man +to set the pager executable and its options, or modify the configuration +file of +.B man +in a similar fashion. +.LP +.BR grotty 's +old output format can be displayed on a terminal by piping through .BR ul (1). Pagers such as @@ -114,11 +176,58 @@ then it will be treated as a bold font. The code field in the font description field gives the code which will be used to output the character. This code can also be used in the -.B \eN +.B \[rs]N escape sequence in .BR troff . +. +. .SH OPTIONS .TP +.B \-b +Suppress the use of overstriking for bold characters. +Ignored if +.B \-c +isn't used. +. +.TP +.B \-B +Use only overstriking for bold-italic characters. +Ignored if +.B \-c +isn't used. +. +.TP +.B \-c +Use +.BR grotty 's +old output format (see above). +This also disables color output. +. +.TP +.B \-d +Ignore all +.B \[rs]D +commands. +Without this +.B grotty +will render +.B \[rs]D'l\|.\|.\|.\&' +commands that have at least one zero argument +(and so are either horizontal or vertical) +using +.BR \- , +.BR | , +and +.B + +characters. +. +.TP +.B \-f +Use form feeds in the output. +A form feed will be output at the end of each page that has no output +on its last line. +. +.TP .BI \-F dir Prepend directory .IB dir /dev name @@ -134,52 +243,69 @@ or .B \-h Use horizontal tabs in the output. Tabs are assumed to be set every 8 columns. +. .TP -.B \-f -Use form feeds in the output. -A form feed will be output at the end of each page that has no output -on its last line. +.B \-i +Use escape sequences to set the italic text attribute instead of the +underline attribute for italic fonts (`I' and `BI'). +Note that most terminals (including xterm) don't support this. +Ignored if +.B \-c +is active. +. .TP -.B \-b -Suppress the use of overstriking for bold characters. +.B \-o +Suppress overstriking (other than for bold or underlined characters in +case the old output format has been activated with +.BR \-c ). +. .TP .B \-u Suppress the use of underlining for italic characters. -.TP -.B \-B -Use only overstriking for bold-italic characters. +Ignored if +.B \-c +isn't used. +. .TP .B \-U Use only underlining for bold-italic characters. -.TP -.B \-o -Suppress overstriking (other than for bold or underlined characters). -.TP -.B \-d -Ignore all -.B \eD -commands. -Without this -.B grotty -will render -.B \eD'l\|.\|.\|.' -commands that have at least at least one zero argument -(and so are either horizontal or vertical) -using -.BR \- , -.B | -and -.B + -characters. +Ignored if +.B \-c +isn't used. +. .TP .B \-v Print the version number. +. +. +.SH USAGE +.B grotty +understands a single X command produced using the +.B \[rs]X +escape sequence. +.TP +.BI \[rs]X'tty:\ sgr\ n ' +If +.I n +is non-zero or missing, enable SGR output (this is the default), otherwise +use the old drawing scheme for bold and underline. +. +. +.SH ENVIRONMENT +.TP +.B GROFF_NO_SGR +If set, the old drawing scheme for bold and underline (using the +backspace character) is active. +Colors are disabled. +. +. .SH FILES .TP .B @FONTDIR@/devascii/DESC Device description file for .B ascii device. +. .TP .BI @FONTDIR@/devascii/ F Font description file for font @@ -187,11 +313,13 @@ Font description file for font of .B ascii device. +. .TP .B @FONTDIR@/devlatin1/DESC Device description file for .B latin1 device. +. .TP .BI @FONTDIR@/devlatin1/ F Font description file for font @@ -199,11 +327,13 @@ Font description file for font of .B latin1 device. +. .TP .B @FONTDIR@/devutf8/DESC Device description file for .B utf8 device. +. .TP .BI @FONTDIR@/devutf8/ F Font description file for font @@ -211,11 +341,13 @@ Font description file for font of .B utf8 device. +. .TP .B @FONTDIR@/devcp1047/DESC Device description file for .B cp1047 device. +. .TP .BI @FONTDIR@/devcp1047/ F Font description file for font @@ -223,10 +355,12 @@ Font description file for font of .B cp1047 device. +. .TP .B @MACRODIR@/tty.tmac Macros for use with .BR grotty . +. .TP .B @MACRODIR@/tty-char.tmac Additional klugdey character definitions for use with @@ -235,6 +369,8 @@ Additional klugdey character definitions for use with Note that on EBCDIC hosts, only files for the .B cp1047 device will be installed. +. +. .SH BUGS .LP .B grotty @@ -243,12 +379,22 @@ is intended only for simple documents. There is no support for fractional horizontal or vertical motions. .LP There is no support for -.B \eD +.B \[rs]D commands other than horizontal and vertical lines. .LP -Characters above the first line (ie with a vertical position of 0) +Characters above the first line (ie with a vertical position of\~0) cannot be printed. +.LP +Color handling is different compared to +.BR grops (@MAN1EXT@). +.B \[rs]M +doesn't set the fill color for closed graphic objects (which +.B grotty +doesn't support anyway) but changes the background color of the character +cell, affecting all subsequent operations. +. +. .SH "SEE ALSO" .BR groff (@MAN1EXT@), .BR @g@troff (@MAN1EXT@), @@ -257,6 +403,7 @@ cannot be printed. .BR groff_char (@MAN7EXT@), .BR ul (1), .BR more (1), +.BR man (1), .BR less (1) . .\" Local Variables: diff --git a/contrib/groff/src/devices/grotty/tty.cc b/contrib/groff/src/devices/grotty/tty.cc index d13adbf..81183b8 100644 --- a/contrib/groff/src/devices/grotty/tty.cc +++ b/contrib/groff/src/devices/grotty/tty.cc @@ -1,5 +1,5 @@ // -*- C++ -*- -/* Copyright (C) 1989-2000, 2001 Free Software Foundation, Inc. +/* Copyright (C) 1989-2000, 2001, 2002 Free Software Foundation, Inc. Written by James Clark (jjc@jclark.com) This file is part of groff. @@ -23,6 +23,8 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ extern "C" const char *Version_string; +#define putstring(s) fputs(s, stdout) + #ifndef SHRT_MIN #define SHRT_MIN (-32768) #endif @@ -39,18 +41,42 @@ static int bold_flag = 1; static int underline_flag = 1; static int overstrike_flag = 1; static int draw_flag = 1; +static int italic_flag = 0; +static int old_drawing_scheme = 0; enum { UNDERLINE_MODE = 0x01, BOLD_MODE = 0x02, VDRAW_MODE = 0x04, HDRAW_MODE = 0x08, - CU_MODE = 0x10 + CU_MODE = 0x10, + COLOR_CHANGE = 0x20 }; // Mode to use for bold-underlining. static unsigned char bold_underline_mode = BOLD_MODE|UNDERLINE_MODE; +#ifndef IS_EBCDIC_HOST +#define CSI "\033[" +#else +#define CSI "\047[" +#endif + +// SGR handling (ISO 6429) +#define SGR_BOLD CSI "1m" +#define SGR_NO_BOLD CSI "22m" +#define SGR_ITALIC CSI "3m" +#define SGR_NO_ITALIC CSI "23m" +#define SGR_UNDERLINE CSI "4m" +#define SGR_NO_UNDERLINE CSI "24m" +// many terminals can't handle `CSI 39 m' and `CSI 49 m' to reset +// the foreground and bachground color, respectively; thus we use +// `CSI 0 m' exclusively +#define SGR_DEFAULT CSI "0m" + +#define TTY_MAX_COLORS 8 +#define DEFAULT_COLOR_IDX TTY_MAX_COLORS + class tty_font : public font { tty_font(const char *); unsigned char mode; @@ -109,10 +135,13 @@ public: short hpos; unsigned int code; unsigned char mode; + unsigned char back_color_idx; + unsigned char fore_color_idx; void *operator new(size_t); void operator delete(void *); inline int draw_mode() { return mode & (VDRAW_MODE|HDRAW_MODE); } - inline int order() { return mode & (VDRAW_MODE|HDRAW_MODE|CU_MODE); } + inline int order() { + return mode & (VDRAW_MODE|HDRAW_MODE|CU_MODE|COLOR_CHANGE); } }; glyph *glyph::free_list = 0; @@ -146,14 +175,26 @@ class tty_printer : public printer { int nlines; int cached_v; int cached_vpos; - void add_char(unsigned int, int, int, unsigned char); + unsigned char curr_fore_idx; + unsigned char curr_back_idx; + int is_underline; + int is_bold; + int cu_flag; + color tty_colors[TTY_MAX_COLORS]; + void make_underline(); + void make_bold(unsigned int); + unsigned char color_to_idx(color *col); + void add_char(unsigned int, int, int, color *, color *, unsigned char); public: tty_printer(const char *device); ~tty_printer(); void set_char(int, font *, const environment *, int, const char *name); void draw(int code, int *p, int np, const environment *env); void special(char *arg, const environment *env, char type); + void change_color(const environment *env); + void change_fill_color(const environment *env); void put_char(unsigned int); + void put_color(unsigned char, int); void begin_page(int) { } void end_page(int page_length); font *make_font(const char *); @@ -162,10 +203,35 @@ public: tty_printer::tty_printer(const char *device) : cached_v(0) { is_utf8 = !strcmp(device, "utf8"); + tty_colors[0].set_rgb(0, // black + 0, + 0); + tty_colors[1].set_rgb(color::MAX_COLOR_VAL, // red + 0, + 0); + tty_colors[2].set_rgb(0, // green + color::MAX_COLOR_VAL, + 0); + tty_colors[3].set_rgb(color::MAX_COLOR_VAL, // yellow + color::MAX_COLOR_VAL, + 0); + tty_colors[4].set_rgb(0, // blue + 0, + color::MAX_COLOR_VAL); + tty_colors[5].set_rgb(color::MAX_COLOR_VAL, // magenta + 0, + color::MAX_COLOR_VAL); + tty_colors[6].set_rgb(0, // cyan + color::MAX_COLOR_VAL, + color::MAX_COLOR_VAL); + tty_colors[7].set_rgb(color::MAX_COLOR_VAL, // white + color::MAX_COLOR_VAL, + color::MAX_COLOR_VAL); nlines = 66; lines = new glyph *[nlines]; for (int i = 0; i < nlines; i++) lines[i] = 0; + cu_flag = 0; } tty_printer::~tty_printer() @@ -173,15 +239,64 @@ tty_printer::~tty_printer() a_delete lines; } +void tty_printer::make_underline() +{ + if (old_drawing_scheme) { + putchar('_'); + putchar('\b'); + } + else { + if (!is_underline) { + if (italic_flag) + putstring(SGR_ITALIC); + else + putstring(SGR_UNDERLINE); + } + is_underline = 1; + } +} + +void tty_printer::make_bold(unsigned int c) +{ + if (old_drawing_scheme) { + put_char(c); + putchar('\b'); + } + else { + if (!is_bold) + putstring(SGR_BOLD); + is_bold = 1; + } +} + +unsigned char tty_printer::color_to_idx(color *col) +{ + if (col->is_default()) + return DEFAULT_COLOR_IDX; + for (int i = 0; i < TTY_MAX_COLORS; i++) + if (*col == tty_colors[i]) + return (unsigned char)i; + unsigned r, g, b; + col->get_rgb(&r, &g, &b); + error("Unknown color (%1, %2, %3) mapped to default", r, g, b); + return DEFAULT_COLOR_IDX; +} + void tty_printer::set_char(int i, font *f, const environment *env, int w, const char *name) { if (w != font::hor) fatal("width of character not equal to horizontal resolution"); - add_char(f->get_code(i), env->hpos, env->vpos, ((tty_font *)f)->get_mode()); + add_char(f->get_code(i), + env->hpos, env->vpos, + env->col, env->fill, + ((tty_font *)f)->get_mode()); } -void tty_printer::add_char(unsigned int c, int h, int v, unsigned char mode) +void tty_printer::add_char(unsigned int c, + int h, int v, + color *fore, color *back, + unsigned char mode) { #if 0 // This is too expensive. @@ -221,12 +336,14 @@ void tty_printer::add_char(unsigned int c, int h, int v, unsigned char mode) glyph *g = new glyph; g->hpos = hpos; g->code = c; + g->fore_color_idx = color_to_idx(fore); + g->back_color_idx = color_to_idx(back); g->mode = mode; // The list will be reversed later. After reversal, it must be in - // increasing order of hpos, with CU specials before HDRAW characters - // before VDRAW characters before normal characters at each hpos, and - // otherwise in order of occurrence. + // increasing order of hpos, with COLOR_CHANGE and CU specials before + // HDRAW characters before VDRAW characters before normal characters + // at each hpos, and otherwise in order of occurrence. glyph **pp; for (pp = lines + (vpos - 1); *pp; pp = &(*pp)->next) @@ -239,8 +356,51 @@ void tty_printer::add_char(unsigned int c, int h, int v, unsigned char mode) void tty_printer::special(char *arg, const environment *env, char type) { - if (type == 'u') - add_char(*arg - '0', env->hpos, env->vpos, CU_MODE); + if (type == 'u') { + add_char(*arg - '0', env->hpos, env->vpos, env->col, env->fill, CU_MODE); + return; + } + if (type != 'p') + return; + char *p; + for (p = arg; *p == ' ' || *p == '\n'; p++) + ; + char *tag = p; + for (; *p != '\0' && *p != ':' && *p != ' ' && *p != '\n'; p++) + ; + if (*p == '\0' || strncmp(tag, "tty", p - tag) != 0) { + error("X command without `tty:' tag ignored"); + return; + } + p++; + for (; *p == ' ' || *p == '\n'; p++) + ; + char *command = p; + for (; *p != '\0' && *p != ' ' && *p != '\n'; p++) + ; + if (*command == '\0') { + error("empty X command ignored"); + return; + } + if (strncmp(command, "sgr", p - command) == 0) { + for (; *p == ' ' || *p == '\n'; p++) + ; + int n; + if (*p != '\0' && sscanf(p, "%d", &n) == 1 && n == 0) + old_drawing_scheme = 1; + else + old_drawing_scheme = 0; + } +} + +void tty_printer::change_color(const environment *env) +{ + add_char(0, env->hpos, env->vpos, env->col, env->fill, COLOR_CHANGE); +} + +void tty_printer::change_fill_color(const environment *env) +{ + add_char(0, env->hpos, env->vpos, env->col, env->fill, COLOR_CHANGE); } void tty_printer::draw(int code, int *p, int np, const environment *env) @@ -260,7 +420,7 @@ void tty_printer::draw(int code, int *p, int np, const environment *env) len = -len; } while (len >= 0) { - add_char('|', env->hpos, v, VDRAW_MODE); + add_char('|', env->hpos, v, env->col, env->fill, VDRAW_MODE); len -= font::vert; v += font::vert; } @@ -274,7 +434,7 @@ void tty_printer::draw(int code, int *p, int np, const environment *env) len = -len; } while (len >= 0) { - add_char('-', h, env->vpos, HDRAW_MODE); + add_char('-', h, env->vpos, env->col, env->fill, HDRAW_MODE); len -= font::hor; h += font::hor; } @@ -302,14 +462,37 @@ void tty_printer::put_char(unsigned int wc) do *++p = (unsigned char)(((wc >> (6 * --count)) & 0x3f) | 0x80); while (count > 0); *++p = '\0'; - fputs(buf, stdout); + putstring(buf); } - else { + else putchar(wc); - } } -int cu_flag = 0; +void tty_printer::put_color(unsigned char color_index, int back) +{ + if (color_index == DEFAULT_COLOR_IDX) { + putstring(SGR_DEFAULT); + // set bold and underline again + if (is_bold) + putstring(SGR_BOLD); + if (is_underline) { + if (italic_flag) + putstring(SGR_ITALIC); + else + putstring(SGR_UNDERLINE); + } + // set other color again + back = !back; + color_index = back ? curr_back_idx : curr_fore_idx; + } + putstring(CSI); + if (back) + putchar('4'); + else + putchar('3'); + putchar(color_index + '0'); + putchar('m'); +} void tty_printer::end_page(int page_length) { @@ -345,6 +528,10 @@ void tty_printer::end_page(int page_length) } int hpos = 0; glyph *nextp; + curr_fore_idx = DEFAULT_COLOR_IDX; + curr_back_idx = DEFAULT_COLOR_IDX; + is_underline = 0; + is_bold = 0; for (p = g; p; delete p, p = nextp) { nextp = p->next; if (p->mode & CU_MODE) { @@ -376,34 +563,79 @@ void tty_printer::end_page(int page_length) int next_tab_pos = ((hpos + TAB_WIDTH) / TAB_WIDTH) * TAB_WIDTH; if (next_tab_pos > p->hpos) break; - if (cu_flag) { - putchar('_'); - putchar('\b'); + if (cu_flag) + make_underline(); + else if (!old_drawing_scheme && is_underline) { + if (italic_flag) + putstring(SGR_NO_ITALIC); + else + putstring(SGR_NO_UNDERLINE); + is_underline = 0; } putchar('\t'); hpos = next_tab_pos; } } for (; hpos < p->hpos; hpos++) { - if (cu_flag) { - putchar('_'); - putchar('\b'); + if (cu_flag) + make_underline(); + else if (!old_drawing_scheme && is_underline) { + if (italic_flag) + putstring(SGR_NO_ITALIC); + else + putstring(SGR_NO_UNDERLINE); + is_underline = 0; } putchar(' '); } } assert(hpos == p->hpos); - if (p->mode & UNDERLINE_MODE) { - putchar('_'); - putchar('\b'); + if (p->mode & COLOR_CHANGE) { + if (!old_drawing_scheme) { + if (p->fore_color_idx != curr_fore_idx) { + put_color(p->fore_color_idx, 0); + curr_fore_idx = p->fore_color_idx; + } + if (p->back_color_idx != curr_back_idx) { + put_color(p->back_color_idx, 1); + curr_back_idx = p->back_color_idx; + } + } + continue; + } + if (p->mode & UNDERLINE_MODE) + make_underline(); + else if (!old_drawing_scheme && is_underline) { + if (italic_flag) + putstring(SGR_NO_ITALIC); + else + putstring(SGR_NO_UNDERLINE); + is_underline = 0; } - if (p->mode & BOLD_MODE) { - put_char(p->code); - putchar('\b'); + if (p->mode & BOLD_MODE) + make_bold(p->code); + else if (!old_drawing_scheme && is_bold) { + putstring(SGR_NO_BOLD); + is_bold = 0; + } + if (!old_drawing_scheme) { + if (p->fore_color_idx != curr_fore_idx) { + put_color(p->fore_color_idx, 0); + curr_fore_idx = p->fore_color_idx; + } + if (p->back_color_idx != curr_back_idx) { + put_color(p->back_color_idx, 1); + curr_back_idx = p->back_color_idx; + } } put_char(p->code); hpos++; } + if (!old_drawing_scheme + && (is_bold || is_underline + || curr_fore_idx != DEFAULT_COLOR_IDX + || curr_back_idx != DEFAULT_COLOR_IDX)) + putstring(SGR_DEFAULT); putchar('\n'); } if (form_feed_flag) { @@ -432,6 +664,8 @@ int main(int argc, char **argv) { program_name = argv[0]; static char stderr_buf[BUFSIZ]; + if (getenv("GROFF_NO_SGR")) + old_drawing_scheme = 1; setbuf(stderr, stderr_buf); int c; static const struct option long_options[] = { @@ -439,19 +673,25 @@ int main(int argc, char **argv) { "version", no_argument, 0, 'v' }, { NULL, 0, 0, 0 } }; - while ((c = getopt_long(argc, argv, "F:vhfbuoBUd", long_options, NULL)) + while ((c = getopt_long(argc, argv, "F:vhfbciuoBUd", long_options, NULL)) != EOF) switch(c) { case 'v': - { - printf("GNU grotty (groff) version %s\n", Version_string); - exit(0); - break; - } + printf("GNU grotty (groff) version %s\n", Version_string); + exit(0); + break; + case 'i': + // Use italic font instead of underlining. + italic_flag = 1; + break; case 'b': // Do not embolden by overstriking. bold_flag = 0; break; + case 'c': + // Use old scheme for emboldening and underline. + old_drawing_scheme = 1; + break; case 'u': // Do not underline. underline_flag = 0; @@ -493,6 +733,13 @@ int main(int argc, char **argv) default: assert(0); } + if (old_drawing_scheme) + italic_flag = 0; + else { + bold_underline_mode = BOLD_MODE|UNDERLINE_MODE; + bold_flag = 1; + underline_flag = 1; + } if (optind >= argc) do_file("-"); else { @@ -505,6 +752,6 @@ int main(int argc, char **argv) static void usage(FILE *stream) { - fprintf(stream, "usage: %s [-hfvbuodBU] [-F dir] [files ...]\n", + fprintf(stream, "usage: %s [-hfvbciuodBU] [-F dir] [files ...]\n", program_name); } |