Fixed output bug where branch length is not printed on branches to leaf nodes

Ian Holmes · Ian Holmes · commit 7874e4577940 · 2015-06-26T14:21:26.000-04:00
diff --git a/knhx.c b/knhx.c
@@ -133,7 +133,13 @@ static void format_node_recur(const knhx1_t *node, const knhx1_t *p, kstring_t *
 			sprintf(numbuf, ":%g", p->d);
 			kputsn(numbuf, strlen(numbuf), s);
 		}
-	} else kputsn(p->name, strlen(p->name), s);
+	} else {
+	  kputsn(p->name, strlen(p->name), s);
+	  if (p->d >= 0) {
+	    sprintf(numbuf, ":%g", p->d);
+	    kputsn(numbuf, strlen(numbuf), s);
+	  }
+	}
 }
 
 void kn_format(const knhx1_t *node, int root, kstring_t *s) // TODO: get rid of recursion

Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,13 @@ static void format_node_recur(const knhx1_t node, const knhx1_t p, kstring_t *`
`133`	`133`	`sprintf(numbuf, ":%g", p->d);`
`134`	`134`	`kputsn(numbuf, strlen(numbuf), s);`
`135`	`135`	`}`
`136`		`- } else kputsn(p->name, strlen(p->name), s);`
	`136`	`+ } else {`
	`137`	`+ kputsn(p->name, strlen(p->name), s);`
	`138`	`+ if (p->d >= 0) {`
	`139`	`+ sprintf(numbuf, ":%g", p->d);`
	`140`	`+ kputsn(numbuf, strlen(numbuf), s);`
	`141`	`+ }`
	`142`	`+ }`
`137`	`143`	`}`
`138`	`144`
`139`	`145`	`void kn_format(const knhx1_t node, int root, kstring_t s) // TODO: get rid of recursion`