aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/mandoc.c
diff options
context:
space:
mode:
authorIngo Schwarze <schwarze@openbsd.org>2014-04-07 17:51:10 +0000
committerIngo Schwarze <schwarze@openbsd.org>2014-04-07 17:51:10 +0000
commit51c756765a232c01c9e5087b28da8115e0b7c5e5 (patch)
tree66b528870520358b289001037e8e89596a68a2a4 /mandoc.c
parent0f4d7e63b2cdb7406eb497a9d061fe740845a0bc (diff)
downloadmandoc-51c756765a232c01c9e5087b28da8115e0b7c5e5.tar.gz
mandoc-51c756765a232c01c9e5087b28da8115e0b7c5e5.tar.zst
mandoc-51c756765a232c01c9e5087b28da8115e0b7c5e5.zip
Accept arbitrary argument delimiters for various roff(7) escape sequences.
Needed for example by the new Perl pod2man(1) preamble.
Diffstat (limited to 'mandoc.c')
-rw-r--r--mandoc.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/mandoc.c b/mandoc.c
index 2df01659..be85a76d 100644
--- a/mandoc.c
+++ b/mandoc.c
@@ -1,4 +1,4 @@
-/* $Id: mandoc.c,v 1.76 2014/03/23 11:25:26 schwarze Exp $ */
+/* $Id: mandoc.c,v 1.77 2014/04/07 17:51:10 schwarze Exp $ */
/*
* Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
* Copyright (c) 2011, 2012, 2013 Ingo Schwarze <schwarze@openbsd.org>
@@ -179,11 +179,11 @@ mandoc_escape(const char **end, const char **start, int *sz)
case ('X'):
/* FALLTHROUGH */
case ('Z'):
- if ('\'' != **start)
+ if ('\0' == **start)
return(ESCAPE_ERROR);
gly = ESCAPE_IGNORE;
+ term = **start;
*start = ++*end;
- term = '\'';
break;
/*
@@ -203,11 +203,11 @@ mandoc_escape(const char **end, const char **start, int *sz)
case ('v'):
/* FALLTHROUGH */
case ('x'):
- if ('\'' != **start)
+ if (strchr("\0 %&()*+-./0123456789:<=>", **start))
return(ESCAPE_ERROR);
gly = ESCAPE_IGNORE;
+ term = **start;
*start = ++*end;
- term = '\'';
break;
/*