[PATCH 1/3] print_wrapped_text(): allow hard newlines
- From
Johannes Schindelin <johannes.schindelin@gmx.de>
- Date
- Sep 23, 2009, 20:34 UTC
- Message-ID
- <alpine.DEB.1.00.0909232232560.4985@pacific.mpi-cbg.de>
- In-Reply-To
- <alpine.DEB.1.00.0909232232050.4985@pacific.mpi-cbg.de>
print_wrapped_text() will insert its own newlines. Up until now, if the text passed to it contained newlines, they would not be handled properly (the wrapping got confused after that).
The strategy is to replace a single new-line with a space, but keep double new-lines so that already-wrapped text with empty lines between paragraphs will be handled properly.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> --- utf8.c | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/utf8.c b/utf8.c index db706ac..589876b 100644 --- a/utf8.c +++ b/utf8.c @@ -310,6 +310,8 @@ int print_wrapped_text(const char *text, int indent, int indent2, int width) if (!c || isspace(c)) { if (w < width || !space) { const char *start = bol; + if (!c && text == start) + return w; if (space) start = space; else @@ -317,13 +319,23 @@ int print_wrapped_text(const char *text, int indent, int indent2, int width) fwrite(start, text - start, 1, stdout); if (!c) return w; - else if (c == '\t') - w |= 0x07; space = text; + if (c == '\t') + w |= 0x07; + else if (c == '\n') { + space++; + if (*space == '\n') { + putchar('\n'); + goto new_line; + } + else + putchar(' '); + } w++; text++; } else { +new_line: putchar('\n'); text = bol = space + isspace(*space); space = NULL;
-- 1.6.4.297.gcb4cc