Module Name: src
Committed By: christos
Date: Wed Apr 3 00:55:33 UTC 2013
Modified Files:
src/external/bsd/mdocml/dist: read.c
Log Message:
do roff nr expansion before trailing backslash
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/mdocml/dist/read.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/mdocml/dist/read.c
diff -u src/external/bsd/mdocml/dist/read.c:1.8 src/external/bsd/mdocml/dist/read.c:1.9
--- src/external/bsd/mdocml/dist/read.c:1.8 Thu Mar 21 21:24:46 2013
+++ src/external/bsd/mdocml/dist/read.c Tue Apr 2 20:55:32 2013
@@ -344,20 +344,20 @@ mparse_buf_r(struct mparse *curp, struct
continue;
}
- /* Trailing backslash = a plain char. */
+ /* Expand registers inline */
+ if ('\\' == blk.buf[i] && 'n' == blk.buf[i + 1]) {
+ roff_expand_nr(curp->roff,
+ blk.buf, &i, blk.sz, &ln.buf, &pos, &ln.sz);
+ continue;
+ }
+ /* Trailing backslash = a plain char. */
if ('\\' != blk.buf[i] || i + 1 == (int)blk.sz) {
if (pos >= (int)ln.sz)
resize_buf(&ln, 256);
ln.buf[pos++] = blk.buf[i++];
continue;
}
-
- if ('\\' == blk.buf[i] && 'n' == blk.buf[i + 1]) {
- roff_expand_nr(curp->roff,
- blk.buf, &i, blk.sz, &ln.buf, &pos, &ln.sz);
- }
-
/*
* Found escape and at least one other character.
* When it's a newline character, skip it.
