diff options
| -rw-r--r-- | TODO | 14 | ||||
| -rw-r--r-- | cgi.c | 24 | ||||
| -rw-r--r-- | demandoc.c | 14 | ||||
| -rw-r--r-- | example.style.css | 8 | ||||
| -rw-r--r-- | main.c | 4 | ||||
| -rw-r--r-- | man-cgi.css | 6 | ||||
| -rw-r--r-- | man_html.c | 4 | ||||
| -rw-r--r-- | manpage.c | 12 | ||||
| -rw-r--r-- | mdoc_validate.c | 4 | ||||
| -rw-r--r-- | style.css | 4 |
10 files changed, 47 insertions, 47 deletions
@@ -1,6 +1,6 @@ ************************************************************************ * Official mandoc TODO. -* $Id: TODO,v 1.197 2015/01/24 01:45:21 schwarze Exp $ +* $Id: TODO,v 1.198 2015/02/10 08:05:30 schwarze Exp $ ************************************************************************ Many issues are annotated for difficulty as follows: @@ -60,7 +60,7 @@ are mere guesses, and some may be wrong. - .fc (field control) found by naddy@ in xloadimage(1) loc ** exist *** algo * size * imp * - + - .nr third argument (auto-increment step size, requires \n+) found by bentley@ in sbcl(1) Mon, 9 Dec 2013 18:36:57 -0700 loc * exist * algo * size * imp ** @@ -80,7 +80,7 @@ are mere guesses, and some may be wrong. found by bentley@ in nmh(1) Mon, 23 Apr 2012 13:38:28 -0600 loc ** exist ** algo ** size * imp ** (parser reorg helps a lot) -- .while and .shift +- .while and .shift found by jca@ in ratpoison(1) Sun, 30 Jun 2013 12:01:09 +0200 loc * exist ** algo ** size ** imp ** @@ -465,7 +465,7 @@ are mere guesses, and some may be wrong. loc * exist * algo * size * imp * - trailing whitespace must be ignored even when followed by a font escape, - see for example + see for example makes \fBdig \fR operate in batch mode @@ -539,7 +539,7 @@ are mere guesses, and some may be wrong. How does SQLITE_CONFIG_PAGECACHE actually work? Document it! from kristaps@ Sat, 09 Aug 2014 13:51:36 +0200 -Several areas can be cleaned up to make mandoc even faster. These are +Several areas can be cleaned up to make mandoc even faster. These are - improve hashing mechanism for macros (quite important: performance) @@ -548,7 +548,7 @@ Several areas can be cleaned up to make mandoc even faster. These are - the PDF file is HUGE: this can be reduced by using relative offsets - instead of re-initialising the roff predefined-strings set before each - parse, create a read-only version the first time and copy it + parse, create a read-only version the first time and copy it loc * exist ** algo ** size * imp ** ************************************************************************ @@ -564,7 +564,7 @@ Several areas can be cleaned up to make mandoc even faster. These are - Find better ways to prevent endless loops in roff(7) macro and string expansion. - + - Finish cleanup of date handling. Decide which formats should be recognized where. Update both mdoc(7) and man(7) documentation. @@ -1,4 +1,4 @@ -/* $Id: cgi.c,v 1.103 2015/01/15 04:26:39 schwarze Exp $ */ +/* $Id: cgi.c,v 1.104 2015/02/10 08:05:30 schwarze Exp $ */ /* * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2014 Ingo Schwarze <schwarze@usta.de> @@ -58,10 +58,10 @@ static void catman(const struct req *, const char *); static void format(const struct req *, const char *); static void html_print(const char *); static void html_putchar(char); -static int http_decode(char *); +static int http_decode(char *); static void http_parse(struct req *, const char *); static void http_print(const char *); -static void http_putchar(char); +static void http_putchar(char); static void http_printquery(const struct req *, const char *); static void pathgen(struct req *); static void pg_error_badrequest(const char *); @@ -186,7 +186,7 @@ http_print(const char *p) static void html_print(const char *p) { - + if (NULL == p) return; while ('\0' != *p) @@ -621,7 +621,7 @@ pg_searchres(const struct req *req, struct manpage *r, size_t sz) for (i = 0; i < sz; i++) { printf("<TR>\n" "<TD CLASS=\"title\">\n" - "<A HREF=\"%s/%s/%s?", + "<A HREF=\"%s/%s/%s?", scriptname, req->q.manpath, r[i].file); http_printquery(req, "&"); printf("\">"); @@ -701,7 +701,7 @@ catman(const struct req *req, const char *file) while (NULL != (p = fgetln(f, &len))) { bold = italic = 0; for (i = 0; i < (int)len - 1; i++) { - /* + /* * This means that the catpage is out of state. * Ignore it and keep going (although the * catpage is bogus). @@ -742,7 +742,7 @@ catman(const struct req *req, const char *file) continue; } - /* + /* * Handle funny behaviour troff-isms. * These grok'd from the original man2html.c. */ @@ -780,7 +780,7 @@ catman(const struct req *req, const char *file) } /* Bold mode. */ - + if (italic) printf("</I>"); if ( ! bold) @@ -791,9 +791,9 @@ catman(const struct req *req, const char *file) html_putchar(p[i]); } - /* + /* * Clean up the last character. - * We can get to a newline; don't print that. + * We can get to a newline; don't print that. */ if (italic) @@ -891,7 +891,7 @@ pg_show(struct req *req, const char *fullpath) pg_error_badrequest( "You did not specify a page to show."); return; - } + } manpath = mandoc_strndup(fullpath, file - fullpath); file++; @@ -1056,7 +1056,7 @@ main(void) MAN_DIR, strerror(errno)); pg_error_internal(); return(EXIT_FAILURE); - } + } memset(&req, 0, sizeof(struct req)); pathgen(&req); @@ -1,4 +1,4 @@ -/* $Id: demandoc.c,v 1.14 2015/02/07 06:28:08 schwarze Exp $ */ +/* $Id: demandoc.c,v 1.15 2015/02/10 08:05:30 schwarze Exp $ */ /* * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv> * @@ -118,7 +118,7 @@ pmandoc(struct mparse *mp, int fd, const char *fn, int list) line = 1; col = 0; - if (mdoc) + if (mdoc) pmdoc(mdoc_node(mdoc), &line, &col, list); else if (man) pman(man_node(man), &line, &col, list); @@ -168,7 +168,7 @@ again: end = p - 1; while (end > start) - if ('.' == *end || ',' == *end || + if ('.' == *end || ',' == *end || '\'' == *end || '"' == *end || ')' == *end || '!' == *end || '?' == *end || ':' == *end || @@ -200,7 +200,7 @@ again: /* * Print the input word, skipping any special characters. */ - while ('\0' != *p) + while ('\0' != *p) if ('\\' == *p) { p++; esc = mandoc_escape(&p, NULL, NULL); @@ -221,7 +221,7 @@ pline(int line, int *linep, int *col, int list) /* * Print out as many lines as needed to reach parity with the - * original input. + * original input. */ while (*linep < line) { @@ -241,7 +241,7 @@ pmdoc(const struct mdoc_node *p, int *line, int *col, int list) pline(p->line, line, col, list); if (MDOC_TEXT == p->type) pstring(p->string, p->pos, col, list); - if (p->child) + if (p->child) pmdoc(p->child, line, col, list); } } @@ -255,7 +255,7 @@ pman(const struct man_node *p, int *line, int *col, int list) pline(p->line, line, col, list); if (MAN_TEXT == p->type) pstring(p->string, p->pos, col, list); - if (p->child) + if (p->child) pman(p->child, line, col, list); } } diff --git a/example.style.css b/example.style.css index 905412b5..90eb4a27 100644 --- a/example.style.css +++ b/example.style.css @@ -1,4 +1,4 @@ -/* $Id: example.style.css,v 1.54 2014/12/10 22:19:45 schwarze Exp $ */ +/* $Id: example.style.css,v 1.55 2015/02/10 08:05:30 schwarze Exp $ */ /* * This is an example style-sheet provided for mandoc(1) and the -Thtml * or -Txhtml output mode. @@ -6,8 +6,8 @@ * See mdoc(7) and man(7) for macro explanations. */ -div.mandoc { min-width: 102ex; - width: 102ex; +div.mandoc { min-width: 102ex; + width: 102ex; font-family: monospace; } /* This is the outer node of all mandoc -T[x]html documents. */ div.mandoc h1 { margin-bottom: 0ex; font-size: inherit; margin-left: -4ex; } /* Section header (Sh, SH). */ div.mandoc h2 { margin-bottom: 0ex; font-size: inherit; margin-left: -2ex; } /* Sub-section header (Ss, SS). */ @@ -39,7 +39,7 @@ div.mandoc .lit { font-style: normal; font-weight: normal; font-family: monosp div.mandoc i.addr { font-weight: normal; } /* Address (Ad). */ div.mandoc i.arg { font-weight: normal; } /* Command argument (Ar). */ div.mandoc span.author { } /* Author name (An). */ -div.mandoc b.cmd { font-style: normal; } /* Command (Cm). */ +div.mandoc b.cmd { font-style: normal; } /* Command (Cm). */ div.mandoc b.config { font-style: normal; } /* Config statement (Cd). */ div.mandoc span.define { } /* Defines (Dv). */ div.mandoc span.desc { } /* Nd. After em-dash. */ @@ -1,4 +1,4 @@ -/* $Id: main.c,v 1.219 2015/02/07 06:28:08 schwarze Exp $ */ +/* $Id: main.c,v 1.220 2015/02/10 08:05:30 schwarze Exp $ */ /* * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2010-2012, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org> @@ -566,7 +566,7 @@ found: " consider running # makewhatis %s\n", progname, name, sec, paths->paths[ipath]); #endif - + *res = mandoc_reallocarray(*res, ++*ressz, sizeof(struct manpage)); page = *res + (*ressz - 1); page->file = file; diff --git a/man-cgi.css b/man-cgi.css index 5300267c..256e8c66 100644 --- a/man-cgi.css +++ b/man-cgi.css @@ -1,10 +1,10 @@ body { font-family: Helvetica, Arial, sans-serif; } -body > div { padding-left: 2em; +body > div { padding-left: 2em; padding-top: 1em; } -body > div#mancgi { padding-left: 0em; +body > div#mancgi { padding-left: 0em; padding-top: 0em; } body > div.results { font-size: smaller; } -#mancgi fieldset { text-align: center; +#mancgi fieldset { text-align: center; border: thin solid silver; border-radius: 1em; font-size: small; } @@ -1,4 +1,4 @@ -/* $Id: man_html.c,v 1.110 2015/01/30 22:04:44 schwarze Exp $ */ +/* $Id: man_html.c,v 1.111 2015/02/10 08:05:30 schwarze Exp $ */ /* * Copyright (c) 2008-2012, 2014 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2013, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org> @@ -216,7 +216,7 @@ print_man_node(MAN_ARGS) print_paragraph(h); return; } - if (n->flags & MAN_LINE && (*n->string == ' ' || + if (n->flags & MAN_LINE && (*n->string == ' ' || (n->prev != NULL && mh->fl & MANH_LITERAL && ! (h->flags & HTML_NONEWLINE)))) print_otag(h, TAG_BR, 0, NULL); @@ -1,4 +1,4 @@ -/* $Id: manpage.c,v 1.9 2014/08/17 03:24:47 schwarze Exp $ */ +/* $Id: manpage.c,v 1.10 2015/02/10 08:05:30 schwarze Exp $ */ /* * Copyright (c) 2012 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2013 Ingo Schwarze <schwarze@openbsd.org> @@ -107,7 +107,7 @@ main(int argc, char *argv[]) return(EXIT_FAILURE); for (i = 0; i < sz; i++) { - printf("%6zu %s: %s\n", + printf("%6zu %s: %s\n", i + 1, res[i].names, res[i].output); free(res[i].names); free(res[i].output); @@ -148,11 +148,11 @@ show: /* NOTREACHED */ usage: fprintf(stderr, "usage: %s [-C conf] " - "[-M paths] " + "[-M paths] " "[-m paths] " "[-S arch] " "[-s section] " - "expr ...\n", + "expr ...\n", progname); return(EXIT_FAILURE); } @@ -174,9 +174,9 @@ show(const char *cmd, const char *file) } else if (pid > 0) { dup2(fds[0], STDIN_FILENO); close(fds[1]); - cmd = NULL != getenv("MANPAGER") ? + cmd = NULL != getenv("MANPAGER") ? getenv("MANPAGER") : - (NULL != getenv("PAGER") ? + (NULL != getenv("PAGER") ? getenv("PAGER") : "more"); execlp(cmd, cmd, (char *)NULL); perror(cmd); diff --git a/mdoc_validate.c b/mdoc_validate.c index 830e9e27..c87ab23f 100644 --- a/mdoc_validate.c +++ b/mdoc_validate.c @@ -1,4 +1,4 @@ -/* $Id: mdoc_validate.c,v 1.276 2015/02/06 16:06:25 schwarze Exp $ */ +/* $Id: mdoc_validate.c,v 1.277 2015/02/10 08:05:30 schwarze Exp $ */ /* * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2010-2015 Ingo Schwarze <schwarze@openbsd.org> @@ -1815,7 +1815,7 @@ static void post_sh_see_also(POST_ARGS) { const struct mdoc_node *n; - const char *name, *sec; + const char *name, *sec; const char *lastname, *lastsec, *lastpunct; int cmp; @@ -1,4 +1,4 @@ -/* $Id: style.css,v 1.30 2014/09/27 11:16:24 kristaps Exp $ */ +/* $Id: style.css,v 1.31 2015/02/10 08:05:30 schwarze Exp $ */ /* * This is an example style-sheet provided for mandoc(1) and the -Thtml @@ -51,7 +51,7 @@ small { } /* Small: SB, SM. */ i.addr { font-weight: normal; } /* Address (Ad). */ i.arg { font-weight: normal; } /* Command argument (Ar). */ span.author { } /* Author name (An). */ -b.cmd { font-style: normal; } /* Command (Cm). */ +b.cmd { font-style: normal; } /* Command (Cm). */ b.config { font-style: normal; } /* Config statement (Cd). */ span.define { } /* Defines (Dv). */ span.desc { } /* Nd. After em-dash. */ |