=================================================================== RCS file: /cvs/mandoc/term_ascii.c,v retrieving revision 1.22 retrieving revision 1.35 diff -u -p -r1.22 -r1.35 --- mandoc/term_ascii.c 2014/03/23 11:25:26 1.22 +++ mandoc/term_ascii.c 2014/10/26 18:07:28 1.35 @@ -1,6 +1,7 @@ -/* $Id: term_ascii.c,v 1.22 2014/03/23 11:25:26 schwarze Exp $ */ +/* $Id: term_ascii.c,v 1.35 2014/10/26 18:07:28 schwarze Exp $ */ /* * Copyright (c) 2010, 2011 Kristaps Dzonsons + * Copyright (c) 2014 Ingo Schwarze * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -14,21 +15,19 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include -#ifdef USE_WCHAR -# include +#if HAVE_WCHAR +#include #endif #include #include #include #include -#ifdef USE_WCHAR -# include +#if HAVE_WCHAR +#include #endif #include "mandoc.h" @@ -37,17 +36,6 @@ #include "term.h" #include "main.h" -/* - * Sadly, this doesn't seem to be defined on systems even when they - * support it. For the time being, remove it and let those compiling - * the software decide for themselves what to use. - */ -#if 0 -#if ! defined(__STDC_ISO_10646__) -# undef USE_WCHAR -#endif -#endif - static struct termp *ascii_init(enum termenc, char *); static double ascii_hspan(const struct termp *, const struct roffsu *); @@ -57,25 +45,27 @@ static void ascii_begin(struct termp *); static void ascii_end(struct termp *); static void ascii_endline(struct termp *); static void ascii_letter(struct termp *, int); +static void ascii_setwidth(struct termp *, int, size_t); -#ifdef USE_WCHAR +#if HAVE_WCHAR static void locale_advance(struct termp *, size_t); static void locale_endline(struct termp *); static void locale_letter(struct termp *, int); static size_t locale_width(const struct termp *, int); #endif + static struct termp * ascii_init(enum termenc enc, char *outopts) { - const char *toks[4]; + const char *toks[5]; char *v; struct termp *p; p = mandoc_calloc(1, sizeof(struct termp)); p->tabwidth = 5; - p->defrmargin = 78; + p->defrmargin = p->lastrmargin = 78; p->begin = ascii_begin; p->end = ascii_end; @@ -86,13 +76,14 @@ ascii_init(enum termenc enc, char *outopts) p->advance = ascii_advance; p->endline = ascii_endline; p->letter = ascii_letter; + p->setwidth = ascii_setwidth; p->width = ascii_width; -#ifdef USE_WCHAR +#if HAVE_WCHAR 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; @@ -106,17 +97,18 @@ ascii_init(enum termenc enc, char *outopts) toks[0] = "indent"; toks[1] = "width"; toks[2] = "mdoc"; - toks[3] = NULL; + toks[3] = "synopsis"; + toks[4] = NULL; 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. @@ -124,6 +116,9 @@ ascii_init(enum termenc enc, char *outopts) p->mdocstyle = 1; p->defindent = 5; break; + case 3: + p->synopsisonly = 1; + break; default: break; } @@ -149,7 +144,6 @@ utf8_alloc(char *outopts) return(ascii_init(TERMENC_UTF8, outopts)); } - void * locale_alloc(char *outopts) { @@ -157,7 +151,98 @@ locale_alloc(char *outopts) return(ascii_init(TERMENC_LOCALE, outopts)); } -/* ARGSUSED */ +static void +ascii_setwidth(struct termp *p, int iop, size_t width) +{ + + p->rmargin = p->defrmargin; + if (0 < iop) + p->defrmargin += width; + else if (0 > iop) + p->defrmargin -= width; + else + p->defrmargin = width ? width : p->lastrmargin; + p->lastrmargin = p->rmargin; + p->rmargin = p->maxrmargin = p->defrmargin; +} + +const char * +ascii_uc2str(int uc) +{ + static const char nbrsp[2] = { ASCII_NBRSP, '\0' }; + static const char *tab[] = { + "","","","","","","","", + "", "\t", "", "", "", "", "", "", + "","","","","","","","", + "","", "","","", "", "", "", + " ", "!", "\"", "#", "$", "%", "&", "'", + "(", ")", "*", "+", ",", "-", ".", "/", + "0", "1", "2", "3", "4", "5", "6", "7", + "8", "9", ":", ";", "<", "=", ">", "?", + "@", "A", "B", "C", "D", "E", "F", "G", + "H", "I", "J", "K", "L", "M", "N", "O", + "P", "Q", "R", "S", "T", "U", "V", "W", + "X", "Y", "Z", "[", "\\", "]", "^", "_", + "`", "a", "b", "c", "d", "e", "f", "g", + "h", "i", "j", "k", "l", "m", "n", "o", + "p", "q", "r", "s", "t", "u", "v", "w", + "x", "y", "z", "{", "|", "}", "~", "", + "<80>", "<81>", "<82>", "<83>", "<84>", "<85>", "<86>", "<87>", + "<88>", "<89>", "<8A>", "<8B>", "<8C>", "<8D>", "<8E>", "<8F>", + "<90>", "<91>", "<92>", "<93>", "<94>", "<95>", "<96>", "<97>", + "<99>", "<99>", "<9A>", "<9B>", "<9C>", "<9D>", "<9E>", "<9F>", + nbrsp, "!", "c", "GBP", "$?", "Y=", "|", "", + "\"", "(C)", "a.", "<<", "","", "(R)", "-", + "","+-", "^2", "^3", "'", "", "","*", + ",", "^1", "o.", ">>", "1/4", "1/2", "3/4", "?", + "A", "A", "A", "A", "Ae", "Aa", "AE", "C", + "E", "E", "E", "E", "I", "I", "I", "I", + "D", "N", "O", "O", "O", "O", "Oe", "*", + "Oe", "U", "U", "U", "Ue", "Y", "Th", "ss", + "a", "a", "a", "a", "ae", "aa", "ae", "c", + "e", "e", "e", "e", "i", "i", "i", "i", + "d", "n", "o", "o", "o", "o", "oe", "/", + "oe", "u", "u", "u", "ue", "y", "th", "y", + "A", "a", "A", "a", "A", "a", "C", "c", + "C", "c", "C", "c", "C", "c", "D", "d", + "D", "d", "E", "e", "E", "e", "E", "e", + "E", "e", "E", "e", "G", "g", "G", "g", + "G", "g", "G", "g", "H", "h", "H", "h", + "I", "i", "I", "i", "I", "i", "I", "i", + "I", "i", "IJ", "ij", "J", "j", "K", "k", + "q", "L", "l", "L", "l", "L", "l", "L", + "l", "L", "l", "N", "n", "N", "n", "N", + "n", "'n", "Ng", "ng", "O", "o", "O", "o", + "O", "o", "OE", "oe", "R", "r", "R", "r", + "R", "r", "S", "s", "S", "s", "S", "s", + "S", "s", "T", "t", "T", "t", "T", "t", + "U", "u", "U", "u", "U", "u", "U", "u", + "U", "u", "U", "u", "W", "w", "Y", "y", + "Y", "Z", "z", "Z", "z", "Z", "z", "s", + "b", "B", "B", "b", "6", "6", "O", "C", + "c", "D", "D", "D", "d", "d", "3", "@", + "E", "F", "f", "G", "G", "hv", "I", "I", + "K", "k", "l", "l", "W", "N", "n", "O", + "O", "o", "OI", "oi", "P", "p", "YR", "2", + "2", "SH", "sh", "t", "T", "t", "T", "U", + "u", "Y", "V", "Y", "y", "Z", "z", "ZH", + "ZH", "zh", "zh", "2", "5", "5", "ts", "w", + "|", "||", "|=", "!", "DZ", "Dz", "dz", "LJ", + "Lj", "lj", "NJ", "Nj", "nj", "A", "a", "I", + "i", "O", "o", "U", "u", "U", "u", "U", + "u", "U", "u", "U", "u", "@", "A", "a", + "A", "a", "AE", "ae", "G", "g", "G", "g", + "K", "k", "O", "o", "O", "o", "ZH", "zh", + "j", "DZ", "D", "dz", "G", "g", "HV", "W", + "N", "n", "A", "a", "AE", "ae", "O", "o"}; + + if (uc < 0) + return(""); + if ((size_t)uc < sizeof(tab)/sizeof(tab[0])) + return(tab[uc]); + return(mchars_uc2str(uc)); +} + static size_t ascii_width(const struct termp *p, int c) { @@ -172,11 +257,10 @@ ascii_free(void *arg) term_free((struct termp *)arg); } -/* ARGSUSED */ static void ascii_letter(struct termp *p, int c) { - + putchar(c); } @@ -194,7 +278,6 @@ ascii_end(struct termp *p) (*p->footf)(p, p->argf); } -/* ARGSUSED */ static void ascii_endline(struct termp *p) { @@ -202,75 +285,86 @@ ascii_endline(struct termp *p) 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) { double r; /* - * Approximate based on character width. These are generated - * entirely by eyeballing the screen, but appear to be correct. + * Approximate based on character width. + * None of these will be actually correct given that an inch on + * the screen depends on character size, terminal, etc., etc. */ - switch (su->unit) { - case (SCALE_CM): - r = 4 * su->scale; + case SCALE_BU: + r = su->scale * 10.0 / 240.0; break; - case (SCALE_IN): - r = 10 * su->scale; + case SCALE_CM: + r = su->scale * 10.0 / 2.54; break; - case (SCALE_PC): - r = (10 * su->scale) / 6; + case SCALE_FS: + r = su->scale * 2730.666; break; - case (SCALE_PT): - r = (10 * su->scale) / 72; + case SCALE_IN: + r = su->scale * 10.0; break; - case (SCALE_MM): - r = su->scale / 1000; + case SCALE_MM: + r = su->scale / 100.0; break; - case (SCALE_VS): - r = su->scale * 2 - 1; + case SCALE_PC: + r = su->scale * 10.0 / 6.0; break; - default: + case SCALE_PT: + r = su->scale * 10.0 / 72.0; + break; + case SCALE_VS: + r = su->scale * 2.0 - 1.0; + break; + case SCALE_EN: + /* FALLTHROUGH */ + case SCALE_EM: r = su->scale; break; + default: + abort(); + /* NOTREACHED */ } return(r); } -#ifdef USE_WCHAR -/* ARGSUSED */ +#if HAVE_WCHAR static size_t locale_width(const struct termp *p, int c) { int rc; - return((rc = wcwidth(c)) < 0 ? 0 : rc); + if (c == ASCII_NBRSP) + c = ' '; + rc = wcwidth(c); + if (rc < 0) + rc = 0; + return(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) { @@ -278,11 +372,10 @@ locale_endline(struct termp *p) putwchar(L'\n'); } -/* ARGSUSED */ static void locale_letter(struct termp *p, int c) { - + putwchar(c); } #endif