Clean up parsing of delimiters in -mdoc. First, remove the "dowarn"

[mandoc.git] / mandoc.c

diff --git a/mandoc.c b/mandoc.c
index 2c59d598cb84f0fcbbed7faf8ec310b790352f5e..2d325aaf61e05f7c50b8f76b6991ba1cb2681543 100644 (file)
--- a/mandoc.c
+++ b/mandoc.c
@@ -1,4 +1,4 @@
-/*     $Id: mandoc.c,v 1.46 2011/04/09 15:35:30 kristaps Exp $ */
+/*     $Id: mandoc.c,v 1.48 2011/04/19 16:38:48 kristaps Exp $ */

 /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>
 /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>


@@ -95,15 +95,6 @@ numescape(const char *start)
        return(++i);
 }
 
        return(++i);
 }
 

-/*
- * Handle an escaped sequeence.  This should be called with any
- * string subsequent a `\'.  Pass a pointer to this substring as "end";
- * it will be set to the supremum of the parsed escape sequence.  If
- * this returns ESCAPE_ERROR, the string is bogus and should be thrown
- * away.  If not ESCAPE_ERROR or ESCAPE_IGNORE, "start" is set to the
- * first relevant character of the substring (font, glyph, whatever) of
- * length sz.  Both "start" and "sz" may be NULL.
- */

 enum mandoc_esc
 mandoc_escape(const char **end, const char **start, int *sz)
 {
 enum mandoc_esc
 mandoc_escape(const char **end, const char **start, int *sz)
 {


@@ -467,11 +458,11 @@ mandoc_getarg(struct mparse *parse, char **cpp, int ln, int *pos)
 
        /* Quoting can only start with a new word. */
        start = *cpp;
 
        /* Quoting can only start with a new word. */
        start = *cpp;

+       quoted = 0;

        if ('"' == *start) {
                quoted = 1;
                start++;
        if ('"' == *start) {
                quoted = 1;
                start++;

-       } else
-               quoted = 0;
+       } 

 
        pairs = 0;
        white = 0;
 
        pairs = 0;
        white = 0;