diff options
| author | Kristaps Dzonsons <kristaps@bsd.lv> | 2010-05-30 21:50:23 +0000 |
|---|---|---|
| committer | Kristaps Dzonsons <kristaps@bsd.lv> | 2010-05-30 21:50:23 +0000 |
| commit | 23898d93c7914bc2b07dc60fde156bdff597205b (patch) | |
| tree | 23e06132fcba83631f2c4e9e04aacf181cfa6a49 | |
| parent | 0d64f6af08ce2f6a106f18985e54fddc428f9777 (diff) | |
| download | mandoc-23898d93c7914bc2b07dc60fde156bdff597205b.tar.gz | |
Final word on lac/ac. Document flow as it relates to phrasing, as I'll
be changing this around and want a record in CVS of what was happening
beforehand.
| -rw-r--r-- | mdoc_macro.c | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/mdoc_macro.c b/mdoc_macro.c index 6c0ecf6d..e0e7ad6f 100644 --- a/mdoc_macro.c +++ b/mdoc_macro.c @@ -1002,11 +1002,11 @@ blk_full(MACRO_PROT_ARGS) } ac = ARGS_ERROR; - lac = ARGS_PHRASE; for ( ; ; ) { la = *pos; - lac = ac; + /* Initialise last-phrase-type with ARGS_PHRASE. */ + lac = ARGS_ERROR == ac ? ARGS_PHRASE : ac; ac = mdoc_args(m, line, pos, buf, tok, &p); if (ARGS_ERROR == ac) @@ -1014,7 +1014,10 @@ blk_full(MACRO_PROT_ARGS) if (ARGS_EOLN == ac) break; - /* Don't emit leading punct. for phrases. */ + /* + * Emit leading punctuation (i.e., punctuation before + * the MDOC_HEAD) for non-phrase types. + */ if (NULL == head && ARGS_PEND != ac && @@ -1027,7 +1030,10 @@ blk_full(MACRO_PROT_ARGS) continue; } - /* Always re-open head for phrases. */ + /* + * Open a head if one hasn't been opened. Re-open head + * for phrases. + */ if (NULL == head || ARGS_PEND == ac || @@ -1041,6 +1047,11 @@ blk_full(MACRO_PROT_ARGS) if (ARGS_PHRASE == ac || ARGS_PEND == ac || ARGS_PPHRASE == ac) { + /* + * Process phrases: set whether we're in a + * partial-phrase (this effects line handling) + * then call down into the phrase parser. + */ if (ARGS_PPHRASE == ac) m->flags |= MDOC_PPHRASE; if (ARGS_PEND == ac && ARGS_PPHRASE == lac) @@ -1054,6 +1065,8 @@ blk_full(MACRO_PROT_ARGS) m->flags &= ~MDOC_PPHRASE; + /* Close out active phrase. */ + if ( ! rew_sub(MDOC_HEAD, m, tok, line, ppos)) return(0); continue; |