version 1.141, 2014/08/16 19:50:37 |
version 1.145, 2014/11/20 00:31:28 |
|
|
/* $Id$ */ |
/* $Id$ */ |
/* |
/* |
* Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2010, 2012, 2013 Ingo Schwarze <schwarze@openbsd.org> |
* Copyright (c) 2010, 2012, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org> |
* |
* |
* 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 |
Line 147 const struct mdoc_macro __mdoc_macros[MDOC_MAX] = { |
|
Line 147 const struct mdoc_macro __mdoc_macros[MDOC_MAX] = { |
|
{ blk_part_exp, MDOC_CALLABLE | MDOC_PARSED | MDOC_EXPLICIT }, /* Eo */ |
{ blk_part_exp, MDOC_CALLABLE | MDOC_PARSED | MDOC_EXPLICIT }, /* Eo */ |
{ in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* Fx */ |
{ in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* Fx */ |
{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Ms */ |
{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Ms */ |
|
{ in_line, MDOC_CALLABLE | MDOC_PARSED | MDOC_JOIN }, /* No */ |
{ in_line_argn, MDOC_CALLABLE | MDOC_PARSED | |
{ in_line_argn, MDOC_CALLABLE | MDOC_PARSED | |
MDOC_IGNDELIM | MDOC_JOIN }, /* No */ |
|
{ in_line_argn, MDOC_CALLABLE | MDOC_PARSED | |
|
MDOC_IGNDELIM | MDOC_JOIN }, /* Ns */ |
MDOC_IGNDELIM | MDOC_JOIN }, /* Ns */ |
{ in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* Nx */ |
{ in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* Nx */ |
{ in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* Ox */ |
{ in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* Ox */ |
Line 210 const struct mdoc_macro __mdoc_macros[MDOC_MAX] = { |
|
Line 209 const struct mdoc_macro __mdoc_macros[MDOC_MAX] = { |
|
{ in_line_eoln, 0 }, /* sp */ |
{ in_line_eoln, 0 }, /* sp */ |
{ in_line_eoln, 0 }, /* %U */ |
{ in_line_eoln, 0 }, /* %U */ |
{ phrase_ta, MDOC_CALLABLE | MDOC_PARSED | MDOC_JOIN }, /* Ta */ |
{ phrase_ta, MDOC_CALLABLE | MDOC_PARSED | MDOC_JOIN }, /* Ta */ |
{ in_line_eoln, 0 }, /* ll */ |
{ in_line_eoln, MDOC_PROLOGUE }, /* ll */ |
}; |
}; |
|
|
const struct mdoc_macro * const mdoc_macros = __mdoc_macros; |
const struct mdoc_macro * const mdoc_macros = __mdoc_macros; |
Line 627 dword(struct mdoc *mdoc, int line, int col, const char |
|
Line 626 dword(struct mdoc *mdoc, int line, int col, const char |
|
if ( ! mdoc_word_alloc(mdoc, line, col, p)) |
if ( ! mdoc_word_alloc(mdoc, line, col, p)) |
return(0); |
return(0); |
|
|
if (DELIM_OPEN == d) |
|
mdoc->last->flags |= MDOC_DELIMO; |
|
|
|
/* |
/* |
* Closing delimiters only suppress the preceding space |
* If the word consists of a bare delimiter, |
* when they follow something, not when they start a new |
* flag the new node accordingly, |
* block or element, and not when they follow `No'. |
* unless doing so was vetoed by the invoking macro. |
* |
* Always clear the veto, it is only valid for one word. |
* XXX Explicitly special-casing MDOC_No here feels |
|
* like a layering violation. Find a better way |
|
* and solve this in the code related to `No'! |
|
*/ |
*/ |
|
|
else if (DELIM_CLOSE == d && mdoc->last->prev && |
if (d == DELIM_OPEN) |
mdoc->last->prev->tok != MDOC_No && |
mdoc->last->flags |= MDOC_DELIMO; |
|
else if (d == DELIM_CLOSE && |
|
! (mdoc->flags & MDOC_NODELIMC) && |
mdoc->last->parent->tok != MDOC_Fd) |
mdoc->last->parent->tok != MDOC_Fd) |
mdoc->last->flags |= MDOC_DELIMC; |
mdoc->last->flags |= MDOC_DELIMC; |
|
|
|
mdoc->flags &= ~MDOC_NODELIMC; |
|
|
return(1); |
return(1); |
} |
} |
|
|
Line 843 blk_exp_close(MACRO_PROT_ARGS) |
|
Line 840 blk_exp_close(MACRO_PROT_ARGS) |
|
static int |
static int |
in_line(MACRO_PROT_ARGS) |
in_line(MACRO_PROT_ARGS) |
{ |
{ |
int la, scope, cnt, nc, nl; |
int la, scope, cnt, firstarg, mayopen, nc, nl; |
enum margverr av; |
enum margverr av; |
enum mdoct ntok; |
enum mdoct ntok; |
enum margserr ac; |
enum margserr ac; |
Line 894 in_line(MACRO_PROT_ARGS) |
|
Line 891 in_line(MACRO_PROT_ARGS) |
|
return(0); |
return(0); |
} |
} |
|
|
|
d = DELIM_NONE; |
|
firstarg = 1; |
|
mayopen = 1; |
for (cnt = scope = 0;; ) { |
for (cnt = scope = 0;; ) { |
la = *pos; |
la = *pos; |
ac = mdoc_args(mdoc, line, pos, buf, tok, &p); |
ac = mdoc_args(mdoc, line, pos, buf, tok, &p); |
|
|
if (ARGS_ERROR == ac) |
if (ac == ARGS_ERROR) |
return(0); |
return(0); |
if (ARGS_EOLN == ac) |
|
|
/* |
|
* At the end of a macro line, |
|
* opening delimiters do not suppress spacing. |
|
*/ |
|
|
|
if (ac == ARGS_EOLN) { |
|
if (d == DELIM_OPEN) |
|
mdoc->last->flags &= ~MDOC_DELIMO; |
break; |
break; |
if (ARGS_PUNCT == ac) |
} |
|
|
|
/* |
|
* The rest of the macro line is only punctuation, |
|
* to be handled by append_delims(). |
|
* If there were no other arguments, |
|
* do not allow the first one to suppress spacing, |
|
* even if it turns out to be a closing one. |
|
*/ |
|
|
|
if (ac == ARGS_PUNCT) { |
|
if (cnt == 0 && nc == 0) |
|
mdoc->flags |= MDOC_NODELIMC; |
break; |
break; |
|
} |
|
|
ntok = ARGS_QWORD == ac ? MDOC_MAX : lookup(tok, p); |
ntok = (ac == ARGS_QWORD || (tok == MDOC_Fn && !cnt)) ? |
|
MDOC_MAX : lookup(tok, p); |
|
|
/* |
/* |
* In this case, we've located a submacro and must |
* In this case, we've located a submacro and must |
Line 948 in_line(MACRO_PROT_ARGS) |
|
Line 970 in_line(MACRO_PROT_ARGS) |
|
if (DELIM_NONE != d) { |
if (DELIM_NONE != d) { |
/* |
/* |
* If we encounter closing punctuation, no word |
* If we encounter closing punctuation, no word |
* has been omitted, no scope is open, and we're |
* has been emitted, no scope is open, and we're |
* allowed to have an empty element, then start |
* allowed to have an empty element, then start |
* a new scope. `Ar', `Fl', and `Li', only do |
* a new scope. |
* this once per invocation. There may be more |
|
* of these (all of them?). |
|
*/ |
*/ |
if (0 == cnt && (nc || MDOC_Li == tok) && |
if ((d == DELIM_CLOSE || |
DELIM_CLOSE == d && ! scope) { |
(d == DELIM_MIDDLE && tok == MDOC_Fl)) && |
|
!cnt && !scope && nc && mayopen) { |
if ( ! mdoc_elem_alloc(mdoc, |
if ( ! mdoc_elem_alloc(mdoc, |
line, ppos, tok, arg)) |
line, ppos, tok, arg)) |
return(0); |
return(0); |
if (MDOC_Ar == tok || MDOC_Li == tok || |
|
MDOC_Fl == tok) |
|
cnt++; |
|
scope = 1; |
scope = 1; |
|
cnt++; |
|
if (MDOC_Nm == tok) |
|
mayopen = 0; |
} |
} |
/* |
/* |
* Close out our scope, if one is open, before |
* Close out our scope, if one is open, before |
Line 971 in_line(MACRO_PROT_ARGS) |
|
Line 992 in_line(MACRO_PROT_ARGS) |
|
if (scope && ! rew_elem(mdoc, tok)) |
if (scope && ! rew_elem(mdoc, tok)) |
return(0); |
return(0); |
scope = 0; |
scope = 0; |
} else if ( ! scope) { |
if (tok == MDOC_Fn) |
|
mayopen = 0; |
|
} else if (mayopen && !scope) { |
if ( ! mdoc_elem_alloc(mdoc, line, ppos, tok, arg)) |
if ( ! mdoc_elem_alloc(mdoc, line, ppos, tok, arg)) |
return(0); |
return(0); |
scope = 1; |
scope = 1; |
|
cnt++; |
} |
} |
|
|
if (DELIM_NONE == d) |
|
cnt++; |
|
|
|
if ( ! dword(mdoc, line, la, p, d, |
if ( ! dword(mdoc, line, la, p, d, |
MDOC_JOIN & mdoc_macros[tok].flags)) |
MDOC_JOIN & mdoc_macros[tok].flags)) |
return(0); |
return(0); |
|
|
/* |
/* |
|
* If the first argument is a closing delimiter, |
|
* do not suppress spacing before it. |
|
*/ |
|
|
|
if (firstarg && d == DELIM_CLOSE && !nc) |
|
mdoc->last->flags &= ~MDOC_DELIMC; |
|
firstarg = 0; |
|
|
|
/* |
* `Fl' macros have their scope re-opened with each new |
* `Fl' macros have their scope re-opened with each new |
* word so that the `-' can be added to each one without |
* word so that the `-' can be added to each one without |
* having to parse out spaces. |
* having to parse out spaces. |
Line 1533 in_line_argn(MACRO_PROT_ARGS) |
|
Line 1563 in_line_argn(MACRO_PROT_ARGS) |
|
|
|
switch (tok) { |
switch (tok) { |
case MDOC_Ap: |
case MDOC_Ap: |
/* FALLTHROUGH */ |
|
case MDOC_No: |
|
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case MDOC_Ns: |
case MDOC_Ns: |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |