aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/mdoc_macro.c
diff options
context:
space:
mode:
authorKristaps Dzonsons <kristaps@bsd.lv>2010-05-07 06:05:38 +0000
committerKristaps Dzonsons <kristaps@bsd.lv>2010-05-07 06:05:38 +0000
commit20276f6161ced22d83924afefed6d39cb45df6f3 (patch)
tree751aeacfe8f17ade13a5dcfbecb2d9b421288b03 /mdoc_macro.c
parent30b7779eb2696f56263ec38a19cce37e4ce809da (diff)
downloadmandoc-20276f6161ced22d83924afefed6d39cb45df6f3.tar.gz
mandoc-20276f6161ced22d83924afefed6d39cb45df6f3.tar.zst
mandoc-20276f6161ced22d83924afefed6d39cb45df6f3.zip
Initial ARGS_PPHRASE (partial phrase) framework.
Running tally of changes in index.sgml.
Diffstat (limited to 'mdoc_macro.c')
-rw-r--r--mdoc_macro.c13
1 files changed, 5 insertions, 8 deletions
diff --git a/mdoc_macro.c b/mdoc_macro.c
index 89240740..86eb7b83 100644
--- a/mdoc_macro.c
+++ b/mdoc_macro.c
@@ -1,4 +1,4 @@
-/* $Id: mdoc_macro.c,v 1.56 2010/05/07 05:54:09 kristaps Exp $ */
+/* $Id: mdoc_macro.c,v 1.57 2010/05/07 06:05:38 kristaps Exp $ */
/*
* Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
*
@@ -632,7 +632,6 @@ append_delims(struct mdoc *mdoc, int line, int *pos, char *buf)
for (;;) {
lastarg = *pos;
ac = mdoc_zargs(mdoc, line, pos, buf, ARGS_NOWARN, &p);
- assert(ARGS_PHRASE != ac);
if (ARGS_ERROR == ac)
return(0);
@@ -965,6 +964,7 @@ blk_full(MACRO_PROT_ARGS)
/* Don't emit leading punct. for phrases. */
if (NULL == head && ARGS_PHRASE != ac &&
+ ARGS_PPHRASE != ac &&
ARGS_QWORD != ac &&
1 == mdoc_isdelim(p)) {
if ( ! mdoc_word_alloc(m, line, la, p))
@@ -974,13 +974,14 @@ blk_full(MACRO_PROT_ARGS)
/* Always re-open head for phrases. */
- if (NULL == head || ARGS_PHRASE == ac) {
+ if (NULL == head || ARGS_PHRASE == ac ||
+ ARGS_PPHRASE == ac) {
if ( ! mdoc_head_alloc(m, line, ppos, tok))
return(0);
head = m->last;
}
- if (ARGS_PHRASE == ac) {
+ if (ARGS_PHRASE == ac || ARGS_PPHRASE == ac) {
if ( ! phrase(m, line, la, buf))
return(0);
if ( ! rew_sub(MDOC_HEAD, m, tok, line, ppos))
@@ -1084,8 +1085,6 @@ blk_part_imp(MACRO_PROT_ARGS)
la = *pos;
ac = mdoc_args(m, line, pos, buf, tok, &p);
- assert(ARGS_PHRASE != ac);
-
if (ARGS_ERROR == ac)
return(0);
if (ARGS_EOLN == ac)
@@ -1187,8 +1186,6 @@ blk_part_exp(MACRO_PROT_ARGS)
if (ARGS_EOLN == ac)
break;
- assert(ARGS_PHRASE != ac);
-
/* Flush out leading punctuation. */
if (NULL == head && ARGS_QWORD != ac &&