Log Message: ----------- Even though the constant ASCII_ESC is only used in the roff pre-parser roff.c, move it to the top level include file mandoc.h to reduce the risk of causing clashes when introducing new ASCII_* constants in the future. Modified Files: -------------- mandoc: mandoc.h roff.c Revision Data ------------- Index: mandoc.h =================================================================== RCS file: /home/cvs/mandoc/mandoc/mandoc.h,v retrieving revision 1.280 retrieving revision 1.281 diff -Lmandoc.h -Lmandoc.h -u -p -r1.280 -r1.281 --- mandoc.h +++ mandoc.h @@ -23,6 +23,8 @@ #define ASCII_NBRZW 30 /* non-breaking zero-width space */ #define ASCII_BREAK 29 /* breakable zero-width space */ #define ASCII_HYPH 28 /* breakable hyphen */ +#define ASCII_ESC 27 /* escape sequence from copy-in processing */ +#define ASCII_TABREF 26 /* reset tab reference position */ /* * Status level. This refers to both internal status (i.e., whilst Index: roff.c =================================================================== RCS file: /home/cvs/mandoc/mandoc/roff.c,v retrieving revision 1.394 retrieving revision 1.395 diff -Lroff.c -Lroff.c -u -p -r1.394 -r1.395 --- roff.c +++ roff.c @@ -40,14 +40,6 @@ #include "tbl_parse.h" #include "eqn_parse.h" -/* - * ASCII_ESC is used to signal from roff_getarg() to roff_expand() - * that an escape sequence resulted from copy-in processing and - * needs to be checked or interpolated. As it is used nowhere - * else, it is defined here rather than in a header file. - */ -#define ASCII_ESC 27 - /* Maximum number of string expansions per line, to break infinite loops. */ #define EXPAND_LIMIT 1000 @@ -1640,8 +1632,13 @@ roff_getarg(struct roff *r, char **cpp, cp++; break; case '\\': - newesc = 1; + /* + * Signal to roff_expand() that an escape + * sequence resulted from copy-in processing + * and needs to be checked or interpolated. + */ cp[-pairs] = ASCII_ESC; + newesc = 1; pairs++; cp++; break; -- To unsubscribe send an email to source+unsubscribe@mandoc.bsd.lv