version 1.81, 2010/07/07 15:04:54 |
version 1.86, 2010/08/08 14:51:32 |
|
|
/* $Id$ */ |
/* $Id$ */ |
/* |
/* |
* Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv> |
* |
* |
* Permission to use, copy, modify, and distribute this software for any |
* Permission to use, copy, modify, and distribute this software for any |
* purpose with or without fee is hereby granted, provided that the above |
* purpose with or without fee is hereby granted, provided that the above |
|
|
#include <sys/types.h> |
#include <sys/types.h> |
|
|
#include <assert.h> |
#include <assert.h> |
#include <ctype.h> |
|
#include <stdarg.h> |
#include <stdarg.h> |
#include <stdlib.h> |
#include <stdlib.h> |
#include <stdio.h> |
#include <stdio.h> |
Line 41 const char *const __man_macronames[MAN_MAX] = { |
|
Line 40 const char *const __man_macronames[MAN_MAX] = { |
|
"nf", "fi", "r", "RE", |
"nf", "fi", "r", "RE", |
"RS", "DT", "UC", "PD", |
"RS", "DT", "UC", "PD", |
"Sp", "Vb", "Ve", "AT", |
"Sp", "Vb", "Ve", "AT", |
|
"in" |
}; |
}; |
|
|
const char * const *man_macronames = __man_macronames; |
const char * const *man_macronames = __man_macronames; |
Line 409 man_ptext(struct man *m, int line, char *buf, int offs |
|
Line 409 man_ptext(struct man *m, int line, char *buf, int offs |
|
*/ |
*/ |
|
|
assert(i); |
assert(i); |
if (mandoc_eos(buf, (size_t)i)) |
if (mandoc_eos(buf, (size_t)i, 0)) |
m->last->flags |= MAN_EOS; |
m->last->flags |= MAN_EOS; |
|
|
descope: |
descope: |
Line 480 man_pmacro(struct man *m, int ln, char *buf, int offs) |
|
Line 480 man_pmacro(struct man *m, int ln, char *buf, int offs) |
|
|
|
ppos = i; |
ppos = i; |
|
|
/* Copy the first word into a nil-terminated buffer. */ |
/* |
|
* Copy the first word into a nil-terminated buffer. |
|
* Stop copying when a tab, space, or eoln is encountered. |
|
*/ |
|
|
for (j = 0; j < 4; j++, i++) { |
j = 0; |
if ('\0' == (mac[j] = buf[i])) |
while (j < 4 && '\0' != buf[i] && ' ' != buf[i] && '\t' != buf[i]) |
break; |
mac[j++] = buf[i++]; |
else if (' ' == buf[i]) |
|
break; |
|
|
|
/* Check for invalid characters. */ |
|
|
|
if (isgraph((u_char)buf[i])) |
|
continue; |
|
if ( ! man_pmsg(m, ln, i, MANDOCERR_BADCHAR)) |
|
return(0); |
|
i--; |
|
} |
|
|
|
mac[j] = '\0'; |
mac[j] = '\0'; |
|
|
if (j == 4 || j < 1) { |
if (j == 4 || j < 1) { |