* pod2mdoc: New sentence, new line.
@ 2015-02-14 10:35 schwarze
0 siblings, 0 replies; only message in thread
From: schwarze @ 2015-02-14 10:35 UTC (permalink / raw)
To: source
Log Message:
-----------
New sentence, new line.
In ordinary text mode, treat tab characters just like blanks.
Treat multiple whitespace characters just like single blanks.
Avoid buffer underruns when detecting function names.
Modified Files:
--------------
pod2mdoc:
pod2mdoc.c
Revision Data
-------------
Index: pod2mdoc.c
===================================================================
RCS file: /home/cvs/mdocml/pod2mdoc/pod2mdoc.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -Lpod2mdoc.c -Lpod2mdoc.c -u -p -r1.41 -r1.42
--- pod2mdoc.c
+++ pod2mdoc.c
@@ -135,7 +135,7 @@ static const char fmts[FMT__MAX] = {
'Z' /* FMT_NULL */
};
-static int last;
+static unsigned char last;
static void
@@ -1395,35 +1395,53 @@ ordinary(struct state *st, const char *b
&start, end, &opstack))
continue;
- /*
- * On whitespace, flush the output buffer
- * and allow breaking to a macro line.
- * Otherwise, merely buffer text.
- */
+ /* Merely buffer non-whitespace. */
last = buf[start++];
- if (' ' != last) {
+ if ( ! isspace(last)) {
outbuf_addchar(st);
continue;
}
- if ( ! strcmp(st->outbuf + st->outbuflen - 2, "()") &&
+ /* Detect function names. */
+
+ if (st->outbuflen > 2 &&
+ ')' == st->outbuf[st->outbuflen - 1] &&
+ '(' == st->outbuf[st->outbuflen - 2] &&
dict_get(st->outbuf, st->outbuflen - 2) ==
MDOC_Fo) {
st->outbuflen -= 2;
st->outbuf[st->outbuflen] = '\0';
mdoc_newln(st);
fputs(".Fn ", stdout);
- outbuf_flush(st);
- mdoc_newln(st);
- continue;
+ st->oust = OUST_MAC;
}
+ /*
+ * On whitespace, flush the output buffer
+ * and allow breaking to a macro line.
+ */
+
outbuf_flush(st);
- if (OUST_MAC == st->oust)
+
+ /*
+ * End macro lines, and
+ * end text lines at the end of sentences.
+ */
+
+ if (OUST_MAC == st->oust || (start > 3 &&
+ ('.' == buf[start - 2] ||
+ '!' == buf[start - 2] ||
+ '?' == buf[start - 2]) &&
+ islower((unsigned char)buf[start - 3]) &&
+ islower((unsigned char)buf[start - 4])))
mdoc_newln(st);
- else
- st->wantws = 1;
+
+ /* Advance to the next word. */
+
+ while (isspace((unsigned char)buf[start]))
+ start++;
+ st->wantws = 1;
}
if (start < end - 1 && '<' == buf[start + 1] &&
--
To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2015-02-14 10:35 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-02-14 10:35 pod2mdoc: New sentence, new line schwarze
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).