=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/term_ascii.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- src/usr.bin/mandoc/term_ascii.c 2014/03/30 21:27:59 1.13 +++ src/usr.bin/mandoc/term_ascii.c 2014/04/20 16:44:44 1.14 @@ -1,4 +1,4 @@ -/* $Id: term_ascii.c,v 1.13 2014/03/30 21:27:59 schwarze Exp $ */ +/* $Id: term_ascii.c,v 1.14 2014/04/20 16:44:44 schwarze Exp $ */ /* * Copyright (c) 2010, 2011 Kristaps Dzonsons * Copyright (c) 2014 Ingo Schwarze @@ -46,6 +46,7 @@ static void locale_letter(struct termp *, int); static size_t locale_width(const struct termp *, int); + static struct termp * ascii_init(enum termenc enc, char *outopts) { @@ -72,8 +73,8 @@ if (TERMENC_ASCII != enc) { v = TERMENC_LOCALE == enc ? - setlocale(LC_ALL, "") : - setlocale(LC_CTYPE, "en_US.UTF-8"); + setlocale(LC_ALL, "") : + setlocale(LC_CTYPE, "en_US.UTF-8"); if (NULL != v && MB_CUR_MAX > 1) { p->enc = enc; p->advance = locale_advance; @@ -90,13 +91,13 @@ while (outopts && *outopts) switch (getsubopt(&outopts, UNCONST(toks), &v)) { - case (0): + case 0: p->defindent = (size_t)atoi(v); break; - case (1): + case 1: p->defrmargin = (size_t)atoi(v); break; - case (2): + case 2: /* * Temporary, undocumented mode * to imitate mdoc(7) output style. @@ -129,7 +130,6 @@ return(ascii_init(TERMENC_UTF8, outopts)); } - void * locale_alloc(char *outopts) { @@ -152,7 +152,6 @@ p->rmargin = p->maxrmargin = p->defrmargin; } -/* ARGSUSED */ static size_t ascii_width(const struct termp *p, int c) { @@ -167,11 +166,10 @@ term_free((struct termp *)arg); } -/* ARGSUSED */ static void ascii_letter(struct termp *p, int c) { - + putchar(c); } @@ -189,7 +187,6 @@ (*p->footf)(p, p->argf); } -/* ARGSUSED */ static void ascii_endline(struct termp *p) { @@ -197,17 +194,15 @@ putchar('\n'); } -/* ARGSUSED */ static void ascii_advance(struct termp *p, size_t len) { - size_t i; + size_t i; for (i = 0; i < len; i++) putchar(' '); } -/* ARGSUSED */ static double ascii_hspan(const struct termp *p, const struct roffsu *su) { @@ -219,22 +214,22 @@ */ switch (su->unit) { - case (SCALE_CM): + case SCALE_CM: r = 4 * su->scale; break; - case (SCALE_IN): + case SCALE_IN: r = 10 * su->scale; break; - case (SCALE_PC): + case SCALE_PC: r = (10 * su->scale) / 6; break; - case (SCALE_PT): + case SCALE_PT: r = (10 * su->scale) / 72; break; - case (SCALE_MM): + case SCALE_MM: r = su->scale / 1000; break; - case (SCALE_VS): + case SCALE_VS: r = su->scale * 2 - 1; break; default: @@ -245,7 +240,6 @@ return(r); } -/* ARGSUSED */ static size_t locale_width(const struct termp *p, int c) { @@ -254,17 +248,15 @@ return((rc = wcwidth(c)) < 0 ? 0 : rc); } -/* ARGSUSED */ static void locale_advance(struct termp *p, size_t len) { - size_t i; + size_t i; for (i = 0; i < len; i++) putwchar(L' '); } -/* ARGSUSED */ static void locale_endline(struct termp *p) { @@ -272,10 +264,9 @@ putwchar(L'\n'); } -/* ARGSUSED */ static void locale_letter(struct termp *p, int c) { - + putwchar(c); }