source@mandoc.bsd.lv
 help / color / mirror / Atom feed
* mandoc: when splitting a composite word,  do not forget to close the
@ 2017-06-26 11:05 schwarze
  0 siblings, 0 replies; only message in thread
From: schwarze @ 2017-06-26 11:05 UTC (permalink / raw)
  To: source

Log Message:
-----------
when splitting a composite word, 
do not forget to close the inserted list box

Modified Files:
--------------
    mandoc:
        eqn.c

Revision Data
-------------
Index: eqn.c
===================================================================
RCS file: /home/cvs/mandoc/mandoc/eqn.c,v
retrieving revision 1.69
retrieving revision 1.70
diff -Leqn.c -Leqn.c -u -p -r1.69 -r1.70
--- eqn.c
+++ eqn.c
@@ -1,4 +1,4 @@
-/*	$Id$
+/*	$Id$ */
 /*
  * Copyright (c) 2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2014, 2015, 2017 Ingo Schwarze <schwarze@openbsd.org>
@@ -722,7 +722,7 @@ static enum rofferr
 eqn_parse(struct eqn_node *ep, struct eqn_box *parent)
 {
 	char		 sym[64];
-	struct eqn_box	*cur, *nbox;
+	struct eqn_box	*cur, *nbox, *split;
 	const char	*cp, *cpn, *start;
 	char		*p;
 	size_t		 sz;
@@ -1118,6 +1118,7 @@ this_tok:
 				break;
 			cpn = p - 1;
 			ccln = CCL_LET;
+			split = NULL;
 			for (;;) {
 				/* Advance to next character. */
 				cp = cpn++;
@@ -1149,13 +1150,13 @@ this_tok:
 					parent->last = cur->prev;
 					parent->args--;
 					/* Set up a list instead. */
-					nbox = eqn_box_alloc(ep, parent);
-					nbox->type = EQN_LIST;
+					split = eqn_box_alloc(ep, parent);
+					split->type = EQN_LIST;
 					/* Insert the word into the list. */
-					nbox->first = nbox->last = cur;
-					cur->parent = nbox;
+					split->first = split->last = cur;
+					cur->parent = split;
 					cur->prev = NULL;
-					parent = nbox;
+					parent = split;
 				}
 				/* Append a new text box. */
 				nbox = eqn_box_alloc(ep, parent);
@@ -1172,6 +1173,8 @@ this_tok:
 				cpn = p - 1;
 				ccln = CCL_LET;
 			}
+			if (split != NULL)
+				parent = split->parent;
 			break;
 		}
 		/*
--
 To unsubscribe send an email to source+unsubscribe@mandoc.bsd.lv

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2017-06-26 11:05 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-06-26 11:05 mandoc: when splitting a composite word, do not forget to close the schwarze

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).