aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/mdoc_macro.c
diff options
context:
space:
mode:
authorKristaps Dzonsons <kristaps@bsd.lv>2010-05-31 15:42:09 +0000
committerKristaps Dzonsons <kristaps@bsd.lv>2010-05-31 15:42:09 +0000
commit21bb451eea95935f615ded5d57dc8c6c9d2224f8 (patch)
treec5d5dd4919b2c176c72b1c15cec53c5535dda349 /mdoc_macro.c
parent021bc3db05c09297aa2ca95496a414c675652db4 (diff)
downloadmandoc-21bb451eea95935f615ded5d57dc8c6c9d2224f8.tar.gz
mandoc-21bb451eea95935f615ded5d57dc8c6c9d2224f8.tar.zst
mandoc-21bb451eea95935f615ded5d57dc8c6c9d2224f8.zip
Add ability to interpret initial free-form lines as part of a `Bl
-column' up until the first `It'. This is UGLY and should have all sorts of warnings, and will. On the one hand, it fits with groff's notion of tabs and tab-spaces. On the other hand, it's not really "free-form" text any more. Note that this does not yet accomodate for macros coming on these lines.
Diffstat (limited to 'mdoc_macro.c')
-rw-r--r--mdoc_macro.c14
1 files changed, 12 insertions, 2 deletions
diff --git a/mdoc_macro.c b/mdoc_macro.c
index f80c84b7..f3890f84 100644
--- a/mdoc_macro.c
+++ b/mdoc_macro.c
@@ -1,4 +1,4 @@
-/* $Id: mdoc_macro.c,v 1.76 2010/05/31 11:52:06 kristaps Exp $ */
+/* $Id: mdoc_macro.c,v 1.77 2010/05/31 15:42:09 kristaps Exp $ */
/*
* Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
*
@@ -1118,7 +1118,7 @@ blk_full(MACRO_PROT_ARGS)
/* If we've already opened our body, exit now. */
if (NULL != body)
- return(1);
+ goto out;
#ifdef UGLY
/*
@@ -1145,6 +1145,16 @@ blk_full(MACRO_PROT_ARGS)
if ( ! mdoc_body_alloc(m, line, ppos, tok))
return(0);
+out:
+ if ( ! (MDOC_FREECOL & m->flags))
+ return(1);
+
+ if ( ! rew_sub(MDOC_BODY, m, tok, line, ppos))
+ return(0);
+ if ( ! rew_sub(MDOC_BLOCK, m, tok, line, ppos))
+ return(0);
+
+ m->flags &= ~MDOC_FREECOL;
return(1);
}