version 1.89, 2010/07/01 21:12:00 |
version 1.93, 2010/07/18 17:00:26 |
|
|
/* $Id$ */ |
/* $Id$ */ |
/* |
/* |
* Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv> |
|
* Copyright (c) 2010 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 34 enum rew { /* see rew_dohalt() */ |
|
Line 35 enum rew { /* see rew_dohalt() */ |
|
REWIND_THIS, |
REWIND_THIS, |
REWIND_MORE, |
REWIND_MORE, |
REWIND_LATER, |
REWIND_LATER, |
REWIND_ERROR, |
REWIND_ERROR |
}; |
}; |
|
|
static int blk_full(MACRO_PROT_ARGS); |
static int blk_full(MACRO_PROT_ARGS); |
Line 609 append_delims(struct mdoc *m, int line, int *pos, char |
|
Line 610 append_delims(struct mdoc *m, int line, int *pos, char |
|
* knowing which symbols break this behaviour, for |
* knowing which symbols break this behaviour, for |
* example, `. ;' shouldn't propogate the double-space. |
* example, `. ;' shouldn't propogate the double-space. |
*/ |
*/ |
if (mandoc_eos(p, strlen(p))) |
if (mandoc_eos(p, strlen(p), 0)) |
m->last->flags |= MDOC_EOS; |
m->last->flags |= MDOC_EOS; |
} |
} |
|
|
Line 1265 blk_part_imp(MACRO_PROT_ARGS) |
|
Line 1266 blk_part_imp(MACRO_PROT_ARGS) |
|
*/ |
*/ |
|
|
if (n && MDOC_TEXT == n->type && n->string) |
if (n && MDOC_TEXT == n->type && n->string) |
if (mandoc_eos(n->string, strlen(n->string))) |
if (mandoc_eos(n->string, strlen(n->string), 1)) |
n->flags |= MDOC_EOS; |
n->flags |= MDOC_EOS; |
|
|
/* Up-propogate the end-of-space flag. */ |
/* Up-propogate the end-of-space flag. */ |
Line 1582 in_line_eoln(MACRO_PROT_ARGS) |
|
Line 1583 in_line_eoln(MACRO_PROT_ARGS) |
|
|
|
assert( ! (MDOC_PARSED & mdoc_macros[tok].flags)); |
assert( ! (MDOC_PARSED & mdoc_macros[tok].flags)); |
|
|
|
if (tok == MDOC_Pp) |
|
rew_sub(MDOC_BLOCK, m, MDOC_Nm, line, ppos); |
|
|
/* Parse macro arguments. */ |
/* Parse macro arguments. */ |
|
|
for (arg = NULL; ; ) { |
for (arg = NULL; ; ) { |
Line 1645 ctx_synopsis(MACRO_PROT_ARGS) |
|
Line 1649 ctx_synopsis(MACRO_PROT_ARGS) |
|
nl = MDOC_NEWLINE & m->flags; |
nl = MDOC_NEWLINE & m->flags; |
|
|
/* If we're not in the SYNOPSIS, go straight to in-line. */ |
/* If we're not in the SYNOPSIS, go straight to in-line. */ |
if (SEC_SYNOPSIS != m->lastsec) |
if ( ! (MDOC_SYNOPSIS & m->flags)) |
return(in_line(m, tok, line, ppos, pos, buf)); |
return(in_line(m, tok, line, ppos, pos, buf)); |
|
|
/* If we're a nested call, same place. */ |
/* If we're a nested call, same place. */ |