=================================================================== RCS file: /cvs/mandoc/mdoc.c,v retrieving revision 1.210 retrieving revision 1.211 diff -u -p -r1.210 -r1.211 --- mandoc/mdoc.c 2014/03/23 12:11:18 1.210 +++ mandoc/mdoc.c 2014/03/23 12:44:56 1.211 @@ -1,4 +1,4 @@ -/* $Id: mdoc.c,v 1.210 2014/03/23 12:11:18 schwarze Exp $ */ +/* $Id: mdoc.c,v 1.211 2014/03/23 12:44:56 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons * Copyright (c) 2010, 2012, 2013, 2014 Ingo Schwarze @@ -22,6 +22,7 @@ #include #include +#include #include #include #include @@ -1019,4 +1020,43 @@ mdoc_isdelim(const char *p) return(DELIM_MIDDLE); return(DELIM_NONE); +} + +void +mdoc_deroff(char **dest, const struct mdoc_node *n) +{ + char *cp; + size_t sz; + + if (MDOC_TEXT != n->type) { + for (n = n->child; n; n = n->next) + mdoc_deroff(dest, n); + return; + } + + /* Skip leading whitespace. */ + + for (cp = n->string; '\0' != *cp; cp++) + if (0 == isspace((unsigned char)*cp)) + break; + + /* Skip trailing whitespace. */ + + for (sz = strlen(cp); sz; sz--) + if (0 == isspace((unsigned char)cp[sz-1])) + break; + + /* Skip empty strings. */ + + if (0 == sz) + return; + + if (NULL == *dest) { + *dest = mandoc_strndup(cp, sz); + return; + } + + mandoc_asprintf(&cp, "%s %*s", *dest, (int)sz, cp); + free(*dest); + *dest = cp; }