version 1.210, 2014/03/23 12:11:18 |
version 1.213, 2014/04/20 16:46:05 |
|
|
#include <sys/types.h> |
#include <sys/types.h> |
|
|
#include <assert.h> |
#include <assert.h> |
|
#include <ctype.h> |
#include <stdarg.h> |
#include <stdarg.h> |
#include <stdio.h> |
#include <stdio.h> |
#include <stdlib.h> |
#include <stdlib.h> |
|
|
#include "libmdoc.h" |
#include "libmdoc.h" |
#include "libmandoc.h" |
#include "libmandoc.h" |
|
|
const char *const __mdoc_macronames[MDOC_MAX] = { |
const char *const __mdoc_macronames[MDOC_MAX] = { |
"Ap", "Dd", "Dt", "Os", |
"Ap", "Dd", "Dt", "Os", |
"Sh", "Ss", "Pp", "D1", |
"Sh", "Ss", "Pp", "D1", |
"Dl", "Bd", "Ed", "Bl", |
"Dl", "Bd", "Ed", "Bl", |
Line 45 const char *const __mdoc_macronames[MDOC_MAX] = { |
|
Line 46 const char *const __mdoc_macronames[MDOC_MAX] = { |
|
"Ic", "In", "Li", "Nd", |
"Ic", "In", "Li", "Nd", |
"Nm", "Op", "Ot", "Pa", |
"Nm", "Op", "Ot", "Pa", |
"Rv", "St", "Va", "Vt", |
"Rv", "St", "Va", "Vt", |
/* LINTED */ |
|
"Xr", "%A", "%B", "%D", |
"Xr", "%A", "%B", "%D", |
/* LINTED */ |
|
"%I", "%J", "%N", "%O", |
"%I", "%J", "%N", "%O", |
/* LINTED */ |
|
"%P", "%R", "%T", "%V", |
"%P", "%R", "%T", "%V", |
"Ac", "Ao", "Aq", "At", |
"Ac", "Ao", "Aq", "At", |
"Bc", "Bf", "Bo", "Bq", |
"Bc", "Bf", "Bo", "Bq", |
Line 66 const char *const __mdoc_macronames[MDOC_MAX] = { |
|
Line 64 const char *const __mdoc_macronames[MDOC_MAX] = { |
|
"Bk", "Ek", "Bt", "Hf", |
"Bk", "Ek", "Bt", "Hf", |
"Fr", "Ud", "Lb", "Lp", |
"Fr", "Ud", "Lb", "Lp", |
"Lk", "Mt", "Brq", "Bro", |
"Lk", "Mt", "Brq", "Bro", |
/* LINTED */ |
|
"Brc", "%C", "Es", "En", |
"Brc", "%C", "Es", "En", |
/* LINTED */ |
|
"Dx", "%Q", "br", "sp", |
"Dx", "%Q", "br", "sp", |
/* LINTED */ |
"%U", "Ta", "ll", |
"%U", "Ta" |
|
}; |
}; |
|
|
const char *const __mdoc_argnames[MDOC_ARG_MAX] = { |
const char *const __mdoc_argnames[MDOC_ARG_MAX] = { |
"split", "nosplit", "ragged", |
"split", "nosplit", "ragged", |
"unfilled", "literal", "file", |
"unfilled", "literal", "file", |
"offset", "bullet", "dash", |
"offset", "bullet", "dash", |
"hyphen", "item", "enum", |
"hyphen", "item", "enum", |
"tag", "diag", "hang", |
"tag", "diag", "hang", |
"ohang", "inset", "column", |
"ohang", "inset", "column", |
"width", "compact", "std", |
"width", "compact", "std", |
"filled", "words", "emphasis", |
"filled", "words", "emphasis", |
"symbolic", "nested", "centered" |
"symbolic", "nested", "centered" |
}; |
}; |
Line 90 const char * const *mdoc_macronames = __mdoc_macroname |
|
Line 85 const char * const *mdoc_macronames = __mdoc_macroname |
|
const char * const *mdoc_argnames = __mdoc_argnames; |
const char * const *mdoc_argnames = __mdoc_argnames; |
|
|
static void mdoc_node_free(struct mdoc_node *); |
static void mdoc_node_free(struct mdoc_node *); |
static void mdoc_node_unlink(struct mdoc *, |
static void mdoc_node_unlink(struct mdoc *, |
struct mdoc_node *); |
struct mdoc_node *); |
static void mdoc_free1(struct mdoc *); |
static void mdoc_free1(struct mdoc *); |
static void mdoc_alloc1(struct mdoc *); |
static void mdoc_alloc1(struct mdoc *); |
static struct mdoc_node *node_alloc(struct mdoc *, int, int, |
static struct mdoc_node *node_alloc(struct mdoc *, int, int, |
enum mdoct, enum mdoc_type); |
enum mdoct, enum mdoc_type); |
static int node_append(struct mdoc *, |
static int node_append(struct mdoc *, |
struct mdoc_node *); |
struct mdoc_node *); |
#if 0 |
#if 0 |
static int mdoc_preptext(struct mdoc *, int, char *, int); |
static int mdoc_preptext(struct mdoc *, int, char *, int); |
Line 104 static int mdoc_preptext(struct mdoc *, int, char * |
|
Line 99 static int mdoc_preptext(struct mdoc *, int, char * |
|
static int mdoc_ptext(struct mdoc *, int, char *, int); |
static int mdoc_ptext(struct mdoc *, int, char *, int); |
static int mdoc_pmacro(struct mdoc *, int, char *, int); |
static int mdoc_pmacro(struct mdoc *, int, char *, int); |
|
|
|
|
const struct mdoc_node * |
const struct mdoc_node * |
mdoc_node(const struct mdoc *mdoc) |
mdoc_node(const struct mdoc *mdoc) |
{ |
{ |
Line 112 mdoc_node(const struct mdoc *mdoc) |
|
Line 108 mdoc_node(const struct mdoc *mdoc) |
|
return(mdoc->first); |
return(mdoc->first); |
} |
} |
|
|
|
|
const struct mdoc_meta * |
const struct mdoc_meta * |
mdoc_meta(const struct mdoc *mdoc) |
mdoc_meta(const struct mdoc *mdoc) |
{ |
{ |
Line 121 mdoc_meta(const struct mdoc *mdoc) |
|
Line 116 mdoc_meta(const struct mdoc *mdoc) |
|
return(&mdoc->meta); |
return(&mdoc->meta); |
} |
} |
|
|
|
|
/* |
/* |
* Frees volatile resources (parse tree, meta-data, fields). |
* Frees volatile resources (parse tree, meta-data, fields). |
*/ |
*/ |
Line 147 mdoc_free1(struct mdoc *mdoc) |
|
Line 141 mdoc_free1(struct mdoc *mdoc) |
|
free(mdoc->meta.date); |
free(mdoc->meta.date); |
} |
} |
|
|
|
|
/* |
/* |
* Allocate all volatile resources (parse tree, meta-data, fields). |
* Allocate all volatile resources (parse tree, meta-data, fields). |
*/ |
*/ |
Line 165 mdoc_alloc1(struct mdoc *mdoc) |
|
Line 158 mdoc_alloc1(struct mdoc *mdoc) |
|
mdoc->next = MDOC_NEXT_CHILD; |
mdoc->next = MDOC_NEXT_CHILD; |
} |
} |
|
|
|
|
/* |
/* |
* Free up volatile resources (see mdoc_free1()) then re-initialises the |
* Free up volatile resources (see mdoc_free1()) then re-initialises the |
* data with mdoc_alloc1(). After invocation, parse data has been reset |
* data with mdoc_alloc1(). After invocation, parse data has been reset |
Line 180 mdoc_reset(struct mdoc *mdoc) |
|
Line 172 mdoc_reset(struct mdoc *mdoc) |
|
mdoc_alloc1(mdoc); |
mdoc_alloc1(mdoc); |
} |
} |
|
|
|
|
/* |
/* |
* Completely free up all volatile and non-volatile parse resources. |
* Completely free up all volatile and non-volatile parse resources. |
* After invocation, the pointer is no longer usable. |
* After invocation, the pointer is no longer usable. |
Line 193 mdoc_free(struct mdoc *mdoc) |
|
Line 184 mdoc_free(struct mdoc *mdoc) |
|
free(mdoc); |
free(mdoc); |
} |
} |
|
|
|
|
/* |
/* |
* Allocate volatile and non-volatile parse resources. |
* Allocate volatile and non-volatile parse resources. |
*/ |
*/ |
struct mdoc * |
struct mdoc * |
mdoc_alloc(struct roff *roff, struct mparse *parse, |
mdoc_alloc(struct roff *roff, struct mparse *parse, |
Line 215 mdoc_alloc(struct roff *roff, struct mparse *parse, |
|
Line 205 mdoc_alloc(struct roff *roff, struct mparse *parse, |
|
return(p); |
return(p); |
} |
} |
|
|
|
|
/* |
/* |
* Climb back up the parse tree, validating open scopes. Mostly calls |
* Climb back up the parse tree, validating open scopes. Mostly calls |
* through to macro_end() in macro.c. |
* through to macro_end() in macro.c. |
Line 279 mdoc_addspan(struct mdoc *mdoc, const struct tbl_span |
|
Line 268 mdoc_addspan(struct mdoc *mdoc, const struct tbl_span |
|
return(1); |
return(1); |
} |
} |
|
|
|
|
/* |
/* |
* Main parse routine. Parses a single line -- really just hands off to |
* Main parse routine. Parses a single line -- really just hands off to |
* the macro (mdoc_pmacro()) or text parser (mdoc_ptext()). |
* the macro (mdoc_pmacro()) or text parser (mdoc_ptext()). |
Line 304 mdoc_parseln(struct mdoc *mdoc, int ln, char *buf, int |
|
Line 292 mdoc_parseln(struct mdoc *mdoc, int ln, char *buf, int |
|
mdoc->flags &= ~MDOC_SYNOPSIS; |
mdoc->flags &= ~MDOC_SYNOPSIS; |
|
|
return(roff_getcontrol(mdoc->roff, buf, &offs) ? |
return(roff_getcontrol(mdoc->roff, buf, &offs) ? |
mdoc_pmacro(mdoc, ln, buf, offs) : |
mdoc_pmacro(mdoc, ln, buf, offs) : |
mdoc_ptext(mdoc, ln, buf, offs)); |
mdoc_ptext(mdoc, ln, buf, offs)); |
} |
} |
|
|
int |
int |
Line 315 mdoc_macro(MACRO_PROT_ARGS) |
|
Line 303 mdoc_macro(MACRO_PROT_ARGS) |
|
|
|
/* If we're in the body, deny prologue calls. */ |
/* If we're in the body, deny prologue calls. */ |
|
|
if (MDOC_PROLOGUE & mdoc_macros[tok].flags && |
if (MDOC_PROLOGUE & mdoc_macros[tok].flags && |
MDOC_PBODY & mdoc->flags) { |
MDOC_PBODY & mdoc->flags) { |
mdoc_pmsg(mdoc, line, ppos, MANDOCERR_BADBODY); |
mdoc_pmsg(mdoc, line, ppos, MANDOCERR_BADBODY); |
return(1); |
return(1); |
} |
} |
|
|
/* If we're in the prologue, deny "body" macros. */ |
/* If we're in the prologue, deny "body" macros. */ |
|
|
if ( ! (MDOC_PROLOGUE & mdoc_macros[tok].flags) && |
if ( ! (MDOC_PROLOGUE & mdoc_macros[tok].flags) && |
! (MDOC_PBODY & mdoc->flags)) { |
! (MDOC_PBODY & mdoc->flags)) { |
mdoc_pmsg(mdoc, line, ppos, MANDOCERR_BADPROLOG); |
mdoc_pmsg(mdoc, line, ppos, MANDOCERR_BADPROLOG); |
if (NULL == mdoc->meta.msec) |
if (NULL == mdoc->meta.msec) |
mdoc->meta.msec = mandoc_strdup("1"); |
mdoc->meta.msec = mandoc_strdup("1"); |
Line 353 node_append(struct mdoc *mdoc, struct mdoc_node *p) |
|
Line 341 node_append(struct mdoc *mdoc, struct mdoc_node *p) |
|
assert(MDOC_ROOT != p->type); |
assert(MDOC_ROOT != p->type); |
|
|
switch (mdoc->next) { |
switch (mdoc->next) { |
case (MDOC_NEXT_SIBLING): |
case MDOC_NEXT_SIBLING: |
mdoc->last->next = p; |
mdoc->last->next = p; |
p->prev = mdoc->last; |
p->prev = mdoc->last; |
p->parent = mdoc->last->parent; |
p->parent = mdoc->last->parent; |
break; |
break; |
case (MDOC_NEXT_CHILD): |
case MDOC_NEXT_CHILD: |
mdoc->last->child = p; |
mdoc->last->child = p; |
p->parent = mdoc->last; |
p->parent = mdoc->last; |
break; |
break; |
Line 375 node_append(struct mdoc *mdoc, struct mdoc_node *p) |
|
Line 363 node_append(struct mdoc *mdoc, struct mdoc_node *p) |
|
*/ |
*/ |
|
|
switch (p->type) { |
switch (p->type) { |
case (MDOC_BODY): |
case MDOC_BODY: |
if (ENDBODY_NOT != p->end) |
if (ENDBODY_NOT != p->end) |
break; |
break; |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (MDOC_TAIL): |
case MDOC_TAIL: |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (MDOC_HEAD): |
case MDOC_HEAD: |
p->norm = p->parent->norm; |
p->norm = p->parent->norm; |
break; |
break; |
default: |
default: |
Line 392 node_append(struct mdoc *mdoc, struct mdoc_node *p) |
|
Line 380 node_append(struct mdoc *mdoc, struct mdoc_node *p) |
|
return(0); |
return(0); |
|
|
switch (p->type) { |
switch (p->type) { |
case (MDOC_HEAD): |
case MDOC_HEAD: |
assert(MDOC_BLOCK == p->parent->type); |
assert(MDOC_BLOCK == p->parent->type); |
p->parent->head = p; |
p->parent->head = p; |
break; |
break; |
case (MDOC_TAIL): |
case MDOC_TAIL: |
assert(MDOC_BLOCK == p->parent->type); |
assert(MDOC_BLOCK == p->parent->type); |
p->parent->tail = p; |
p->parent->tail = p; |
break; |
break; |
case (MDOC_BODY): |
case MDOC_BODY: |
if (p->end) |
if (p->end) |
break; |
break; |
assert(MDOC_BLOCK == p->parent->type); |
assert(MDOC_BLOCK == p->parent->type); |
Line 413 node_append(struct mdoc *mdoc, struct mdoc_node *p) |
|
Line 401 node_append(struct mdoc *mdoc, struct mdoc_node *p) |
|
mdoc->last = p; |
mdoc->last = p; |
|
|
switch (p->type) { |
switch (p->type) { |
case (MDOC_TBL): |
case MDOC_TBL: |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (MDOC_TEXT): |
case MDOC_TEXT: |
if ( ! mdoc_valid_post(mdoc)) |
if ( ! mdoc_valid_post(mdoc)) |
return(0); |
return(0); |
break; |
break; |
Line 426 node_append(struct mdoc *mdoc, struct mdoc_node *p) |
|
Line 414 node_append(struct mdoc *mdoc, struct mdoc_node *p) |
|
return(1); |
return(1); |
} |
} |
|
|
|
|
static struct mdoc_node * |
static struct mdoc_node * |
node_alloc(struct mdoc *mdoc, int line, int pos, |
node_alloc(struct mdoc *mdoc, int line, int pos, |
enum mdoct tok, enum mdoc_type type) |
enum mdoct tok, enum mdoc_type type) |
{ |
{ |
struct mdoc_node *p; |
struct mdoc_node *p; |
Line 454 node_alloc(struct mdoc *mdoc, int line, int pos, |
|
Line 441 node_alloc(struct mdoc *mdoc, int line, int pos, |
|
return(p); |
return(p); |
} |
} |
|
|
|
|
int |
int |
mdoc_tail_alloc(struct mdoc *mdoc, int line, int pos, enum mdoct tok) |
mdoc_tail_alloc(struct mdoc *mdoc, int line, int pos, enum mdoct tok) |
{ |
{ |
Line 467 mdoc_tail_alloc(struct mdoc *mdoc, int line, int pos, |
|
Line 453 mdoc_tail_alloc(struct mdoc *mdoc, int line, int pos, |
|
return(1); |
return(1); |
} |
} |
|
|
|
|
int |
int |
mdoc_head_alloc(struct mdoc *mdoc, int line, int pos, enum mdoct tok) |
mdoc_head_alloc(struct mdoc *mdoc, int line, int pos, enum mdoct tok) |
{ |
{ |
Line 483 mdoc_head_alloc(struct mdoc *mdoc, int line, int pos, |
|
Line 468 mdoc_head_alloc(struct mdoc *mdoc, int line, int pos, |
|
return(1); |
return(1); |
} |
} |
|
|
|
|
int |
int |
mdoc_body_alloc(struct mdoc *mdoc, int line, int pos, enum mdoct tok) |
mdoc_body_alloc(struct mdoc *mdoc, int line, int pos, enum mdoct tok) |
{ |
{ |
Line 496 mdoc_body_alloc(struct mdoc *mdoc, int line, int pos, |
|
Line 480 mdoc_body_alloc(struct mdoc *mdoc, int line, int pos, |
|
return(1); |
return(1); |
} |
} |
|
|
|
|
int |
int |
mdoc_endbody_alloc(struct mdoc *mdoc, int line, int pos, enum mdoct tok, |
mdoc_endbody_alloc(struct mdoc *mdoc, int line, int pos, enum mdoct tok, |
struct mdoc_node *body, enum mdoc_endbody end) |
struct mdoc_node *body, enum mdoc_endbody end) |
Line 513 mdoc_endbody_alloc(struct mdoc *mdoc, int line, int po |
|
Line 496 mdoc_endbody_alloc(struct mdoc *mdoc, int line, int po |
|
return(1); |
return(1); |
} |
} |
|
|
|
|
int |
int |
mdoc_block_alloc(struct mdoc *mdoc, int line, int pos, |
mdoc_block_alloc(struct mdoc *mdoc, int line, int pos, |
enum mdoct tok, struct mdoc_arg *args) |
enum mdoct tok, struct mdoc_arg *args) |
{ |
{ |
struct mdoc_node *p; |
struct mdoc_node *p; |
Line 526 mdoc_block_alloc(struct mdoc *mdoc, int line, int pos, |
|
Line 508 mdoc_block_alloc(struct mdoc *mdoc, int line, int pos, |
|
(args->refcnt)++; |
(args->refcnt)++; |
|
|
switch (tok) { |
switch (tok) { |
case (MDOC_Bd): |
case MDOC_Bd: |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (MDOC_Bf): |
case MDOC_Bf: |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (MDOC_Bl): |
case MDOC_Bl: |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (MDOC_Rs): |
case MDOC_Rs: |
p->norm = mandoc_calloc(1, sizeof(union mdoc_data)); |
p->norm = mandoc_calloc(1, sizeof(union mdoc_data)); |
break; |
break; |
default: |
default: |
Line 545 mdoc_block_alloc(struct mdoc *mdoc, int line, int pos, |
|
Line 527 mdoc_block_alloc(struct mdoc *mdoc, int line, int pos, |
|
return(1); |
return(1); |
} |
} |
|
|
|
|
int |
int |
mdoc_elem_alloc(struct mdoc *mdoc, int line, int pos, |
mdoc_elem_alloc(struct mdoc *mdoc, int line, int pos, |
enum mdoct tok, struct mdoc_arg *args) |
enum mdoct tok, struct mdoc_arg *args) |
{ |
{ |
struct mdoc_node *p; |
struct mdoc_node *p; |
Line 558 mdoc_elem_alloc(struct mdoc *mdoc, int line, int pos, |
|
Line 539 mdoc_elem_alloc(struct mdoc *mdoc, int line, int pos, |
|
(args->refcnt)++; |
(args->refcnt)++; |
|
|
switch (tok) { |
switch (tok) { |
case (MDOC_An): |
case MDOC_An: |
p->norm = mandoc_calloc(1, sizeof(union mdoc_data)); |
p->norm = mandoc_calloc(1, sizeof(union mdoc_data)); |
break; |
break; |
default: |
default: |
Line 614 mdoc_node_free(struct mdoc_node *p) |
|
Line 595 mdoc_node_free(struct mdoc_node *p) |
|
free(p); |
free(p); |
} |
} |
|
|
|
|
static void |
static void |
mdoc_node_unlink(struct mdoc *mdoc, struct mdoc_node *n) |
mdoc_node_unlink(struct mdoc *mdoc, struct mdoc_node *n) |
{ |
{ |
Line 652 mdoc_node_unlink(struct mdoc *mdoc, struct mdoc_node * |
|
Line 632 mdoc_node_unlink(struct mdoc *mdoc, struct mdoc_node * |
|
mdoc->first = NULL; |
mdoc->first = NULL; |
} |
} |
|
|
|
|
void |
void |
mdoc_node_delete(struct mdoc *mdoc, struct mdoc_node *p) |
mdoc_node_delete(struct mdoc *mdoc, struct mdoc_node *p) |
{ |
{ |
Line 723 mdoc_preptext(struct mdoc *mdoc, int line, char *buf, |
|
Line 702 mdoc_preptext(struct mdoc *mdoc, int line, char *buf, |
|
if ( ! mdoc_addeqn(mdoc, roff_eqn(mdoc->roff))) |
if ( ! mdoc_addeqn(mdoc, roff_eqn(mdoc->roff))) |
return(0); |
return(0); |
offs += (end - (buf + offs)); |
offs += (end - (buf + offs)); |
} |
} |
|
|
return(1); |
return(1); |
} |
} |
Line 757 mdoc_ptext(struct mdoc *mdoc, int line, char *buf, int |
|
Line 736 mdoc_ptext(struct mdoc *mdoc, int line, char *buf, int |
|
*/ |
*/ |
|
|
if (MDOC_Bl == n->tok && MDOC_BODY == n->type && |
if (MDOC_Bl == n->tok && MDOC_BODY == n->type && |
LIST_column == n->norm->Bl.type) { |
LIST_column == n->norm->Bl.type) { |
/* `Bl' is open without any children. */ |
/* `Bl' is open without any children. */ |
mdoc->flags |= MDOC_FREECOL; |
mdoc->flags |= MDOC_FREECOL; |
return(mdoc_macro(mdoc, MDOC_It, line, offs, &offs, buf)); |
return(mdoc_macro(mdoc, MDOC_It, line, offs, &offs, buf)); |
} |
} |
|
|
if (MDOC_It == n->tok && MDOC_BLOCK == n->type && |
if (MDOC_It == n->tok && MDOC_BLOCK == n->type && |
NULL != n->parent && |
NULL != n->parent && |
MDOC_Bl == n->parent->tok && |
MDOC_Bl == n->parent->tok && |
LIST_column == n->parent->norm->Bl.type) { |
LIST_column == n->parent->norm->Bl.type) { |
/* `Bl' has block-level `It' children. */ |
/* `Bl' has block-level `It' children. */ |
mdoc->flags |= MDOC_FREECOL; |
mdoc->flags |= MDOC_FREECOL; |
return(mdoc_macro(mdoc, MDOC_It, line, offs, &offs, buf)); |
return(mdoc_macro(mdoc, MDOC_It, line, offs, &offs, buf)); |
Line 852 mdoc_ptext(struct mdoc *mdoc, int line, char *buf, int |
|
Line 831 mdoc_ptext(struct mdoc *mdoc, int line, char *buf, int |
|
return(1); |
return(1); |
} |
} |
|
|
|
|
/* |
/* |
* Parse a macro line, that is, a line beginning with the control |
* Parse a macro line, that is, a line beginning with the control |
* character. |
* character. |
Line 875 mdoc_pmacro(struct mdoc *mdoc, int ln, char *buf, int |
|
Line 853 mdoc_pmacro(struct mdoc *mdoc, int ln, char *buf, int |
|
|
|
sv = offs; |
sv = offs; |
|
|
/* |
/* |
* 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. |
* Stop copying when a tab, space, or eoln is encountered. |
*/ |
*/ |
|
|
i = 0; |
i = 0; |
while (i < 4 && '\0' != buf[offs] && |
while (i < 4 && '\0' != buf[offs] && ' ' != buf[offs] && |
' ' != buf[offs] && '\t' != buf[offs]) |
'\t' != buf[offs]) |
mac[i++] = buf[offs++]; |
mac[i++] = buf[offs++]; |
|
|
mac[i] = '\0'; |
mac[i] = '\0'; |
Line 890 mdoc_pmacro(struct mdoc *mdoc, int ln, char *buf, int |
|
Line 868 mdoc_pmacro(struct mdoc *mdoc, int ln, char *buf, int |
|
tok = (i > 1 || i < 4) ? mdoc_hash_find(mac) : MDOC_MAX; |
tok = (i > 1 || i < 4) ? mdoc_hash_find(mac) : MDOC_MAX; |
|
|
if (MDOC_MAX == tok) { |
if (MDOC_MAX == tok) { |
mandoc_vmsg(MANDOCERR_MACRO, mdoc->parse, |
mandoc_vmsg(MANDOCERR_MACRO, mdoc->parse, |
ln, sv, "%s", buf + sv - 1); |
ln, sv, "%s", buf + sv - 1); |
return(1); |
return(1); |
} |
} |
|
|
Line 905 mdoc_pmacro(struct mdoc *mdoc, int ln, char *buf, int |
|
Line 883 mdoc_pmacro(struct mdoc *mdoc, int ln, char *buf, int |
|
while (buf[offs] && ' ' == buf[offs]) |
while (buf[offs] && ' ' == buf[offs]) |
offs++; |
offs++; |
|
|
/* |
/* |
* Trailing whitespace. Note that tabs are allowed to be passed |
* Trailing whitespace. Note that tabs are allowed to be passed |
* into the parser as "text", so we only warn about spaces here. |
* into the parser as "text", so we only warn about spaces here. |
*/ |
*/ |
Line 919 mdoc_pmacro(struct mdoc *mdoc, int ln, char *buf, int |
|
Line 897 mdoc_pmacro(struct mdoc *mdoc, int ln, char *buf, int |
|
*/ |
*/ |
|
|
if (NULL == mdoc->last || MDOC_It == tok || MDOC_El == tok) { |
if (NULL == mdoc->last || MDOC_It == tok || MDOC_El == tok) { |
if ( ! mdoc_macro(mdoc, tok, ln, sv, &offs, buf)) |
if ( ! mdoc_macro(mdoc, tok, ln, sv, &offs, buf)) |
goto err; |
goto err; |
return(1); |
return(1); |
} |
} |
Line 933 mdoc_pmacro(struct mdoc *mdoc, int ln, char *buf, int |
|
Line 911 mdoc_pmacro(struct mdoc *mdoc, int ln, char *buf, int |
|
*/ |
*/ |
|
|
if (MDOC_Bl == n->tok && MDOC_BODY == n->type && |
if (MDOC_Bl == n->tok && MDOC_BODY == n->type && |
LIST_column == n->norm->Bl.type) { |
LIST_column == n->norm->Bl.type) { |
mdoc->flags |= MDOC_FREECOL; |
mdoc->flags |= MDOC_FREECOL; |
if ( ! mdoc_macro(mdoc, MDOC_It, ln, sv, &sv, buf)) |
if ( ! mdoc_macro(mdoc, MDOC_It, ln, sv, &sv, buf)) |
goto err; |
goto err; |
Line 947 mdoc_pmacro(struct mdoc *mdoc, int ln, char *buf, int |
|
Line 925 mdoc_pmacro(struct mdoc *mdoc, int ln, char *buf, int |
|
*/ |
*/ |
|
|
if (MDOC_It == n->tok && MDOC_BLOCK == n->type && |
if (MDOC_It == n->tok && MDOC_BLOCK == n->type && |
NULL != n->parent && |
NULL != n->parent && |
MDOC_Bl == n->parent->tok && |
MDOC_Bl == n->parent->tok && |
LIST_column == n->parent->norm->Bl.type) { |
LIST_column == n->parent->norm->Bl.type) { |
mdoc->flags |= MDOC_FREECOL; |
mdoc->flags |= MDOC_FREECOL; |
if ( ! mdoc_macro(mdoc, MDOC_It, ln, sv, &sv, buf)) |
if ( ! mdoc_macro(mdoc, MDOC_It, ln, sv, &sv, buf)) |
goto err; |
goto err; |
return(1); |
return(1); |
} |
} |
|
|
/* Normal processing of a macro. */ |
/* Normal processing of a macro. */ |
|
|
if ( ! mdoc_macro(mdoc, tok, ln, sv, &offs, buf)) |
if ( ! mdoc_macro(mdoc, tok, ln, sv, &offs, buf)) |
goto err; |
goto err; |
|
|
/* In quick mode (for mandocdb), abort after the NAME section. */ |
/* In quick mode (for mandocdb), abort after the NAME section. */ |
Line 984 mdoc_isdelim(const char *p) |
|
Line 962 mdoc_isdelim(const char *p) |
|
|
|
if ('\0' == p[1]) |
if ('\0' == p[1]) |
switch (p[0]) { |
switch (p[0]) { |
case('('): |
case '(': |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case('['): |
case '[': |
return(DELIM_OPEN); |
return(DELIM_OPEN); |
case('|'): |
case '|': |
return(DELIM_MIDDLE); |
return(DELIM_MIDDLE); |
case('.'): |
case '.': |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case(','): |
case ',': |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case(';'): |
case ';': |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case(':'): |
case ':': |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case('?'): |
case '?': |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case('!'): |
case '!': |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case(')'): |
case ')': |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case(']'): |
case ']': |
return(DELIM_CLOSE); |
return(DELIM_CLOSE); |
default: |
default: |
return(DELIM_NONE); |
return(DELIM_NONE); |
Line 1019 mdoc_isdelim(const char *p) |
|
Line 997 mdoc_isdelim(const char *p) |
|
return(DELIM_MIDDLE); |
return(DELIM_MIDDLE); |
|
|
return(DELIM_NONE); |
return(DELIM_NONE); |
|
} |
|
|
|
void |
|
mdoc_deroff(char **dest, const struct mdoc_node *n) |
|
{ |
|
char *cp; |
|
size_t sz; |
|
|
|
if (MDOC_TEXT != n->type) { |
|
for (n = n->child; n; n = n->next) |
|
mdoc_deroff(dest, n); |
|
return; |
|
} |
|
|
|
/* Skip leading whitespace. */ |
|
|
|
for (cp = n->string; '\0' != *cp; cp++) |
|
if (0 == isspace((unsigned char)*cp)) |
|
break; |
|
|
|
/* Skip trailing whitespace. */ |
|
|
|
for (sz = strlen(cp); sz; sz--) |
|
if (0 == isspace((unsigned char)cp[sz-1])) |
|
break; |
|
|
|
/* Skip empty strings. */ |
|
|
|
if (0 == sz) |
|
return; |
|
|
|
if (NULL == *dest) { |
|
*dest = mandoc_strndup(cp, sz); |
|
return; |
|
} |
|
|
|
mandoc_asprintf(&cp, "%s %*s", *dest, (int)sz, cp); |
|
free(*dest); |
|
*dest = cp; |
} |
} |