Handle output encoding for unicode, numbered and named escape sequences

[mandoc.git] / man_macro.c

diff --git a/man_macro.c b/man_macro.c
index ea45a504db4c9da5313d570c6276712684f21570..15eee4936e5437e94a9176c94f3379ed97826b27 100644 (file)
--- a/man_macro.c
+++ b/man_macro.c
@@ -1,4 +1,4 @@
-/*     $Id: man_macro.c,v 1.87 2014/07/30 23:01:39 schwarze Exp $ */
+/*     $Id: man_macro.c,v 1.89 2014/08/18 16:36:54 schwarze Exp $ */

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


@@ -16,9 +16,9 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */

-#ifdef HAVE_CONFIG_H

 #include "config.h"
 #include "config.h"

-#endif
+
+#include <sys/types.h>

 
 #include <assert.h>
 #include <ctype.h>
 
 #include <assert.h>
 #include <ctype.h>


@@ -100,7 +100,6 @@ man_unscope(struct man *man, const struct man_node *to)
 {
        struct man_node *n;
 
 {
        struct man_node *n;
 

-       man->next = MAN_NEXT_SIBLING;

        to = to->parent;
        n = man->last;
        while (n != to) {
        to = to->parent;
        n = man->last;
        while (n != to) {


@@ -139,11 +138,23 @@ man_unscope(struct man *man, const struct man_node *to)
                 * Save a pointer to the parent such that
                 * we know where to continue the iteration.
                 */
                 * Save a pointer to the parent such that
                 * we know where to continue the iteration.
                 */

+

                man->last = n;
                n = n->parent;
                if ( ! man_valid_post(man))
                        return(0);
        }
                man->last = n;
                n = n->parent;
                if ( ! man_valid_post(man))
                        return(0);
        }

+
+       /*
+        * If we ended up at the parent of the node we were
+        * supposed to rewind to, that means the target node
+        * got deleted, so add the next node we parse as a child
+        * of the parent instead of as a sibling of the target.
+        */
+
+       man->next = (man->last == to) ?
+           MAN_NEXT_CHILD : MAN_NEXT_SIBLING;
+

        return(1);
 }
 
        return(1);
 }