Ticket #68: ticket68.patch

src/extend.c

@@ -83 +83 @@
 
 static int show_breaks = 0;
 
-static void do_stn(point *, double, const char *, int, int);
+static void do_stn(point *, point *, double, const char *, int, int);
 
 typedef struct pfx {
    const char *label;
@@ -636 +636 @@
          }
       }
    }
+   fprintf(stderr, "*start %s\n", start->stns->label);
 
    /* TRANSLATORS: for extend:
     * Used to tell the user that a file is being written - %s is the filename
@@ -645 +646 @@
    pimg_out = img_open_write(fnm_out, desc, img_FFLAG_EXTENDED);
 
    /* Only does single connected component currently. */
-   do_stn(start, 0.0, NULL, ERIGHT, 0);
+   do_stn(NULL, start, 0.0, NULL, ERIGHT, 0);
 
    if (have_xsect) {
       img_rewind(pimg);
@@ -694 +695 @@
 }
 
 static void
-do_stn(point *p, double X, const char *prefix, int dir, int labOnly)
+do_stn(point * prev, point *p, double X, const char *prefix, int dir, int labOnly)
 {
    leg *l, *lp;
    double dX;
@@ -704 +705 @@
    for (s = p->stns; s; s = s->next) {
       img_write_item(pimg_out, img_LABEL, s->flags, s->label, X, 0, p->p.z);
    }
-   if (show_breaks && p->X != HUGE_VAL && p->X != X) {
-      /* Draw "surface" leg between broken stations. */
-      img_write_item(pimg_out, img_MOVE, 0, NULL, p->X, 0, p->p.z);
-      img_write_item(pimg_out, img_LINE, img_FLAG_SURFACE, NULL, X, 0, p->p.z);
+   if (p->X != HUGE_VAL && p->X != X) {
+      fprintf(stderr, "*break %s %s\n", p->stns->label, prev->stns->label);
+      if (show_breaks) {
+         /* Draw "surface" leg between broken stations. */
+         img_write_item(pimg_out, img_MOVE, 0, NULL, p->X, 0, p->p.z);
+         img_write_item(pimg_out, img_LINE, img_FLAG_SURFACE, NULL, X, 0, p->p.z);
+      }
    }
    p->X = X;
    if (labOnly || p->fBroken) {
@@ -743 +747 @@
             img_write_item(pimg_out, img_LINE, l->flags, l->prefix,
                            X, 0, l->to->p.z);
             l->fDone = 1;
-            do_stn(l->fr, X + dX, l->prefix, dir, (l->broken & BREAK_FR));
+            do_stn(p, l->fr, X + dX, l->prefix, dir, (l->broken & BREAK_FR));
             l = lp;
          } else if (l->fr == p) {
             if (l->broken & BREAK_FR) continue;
@@ -758 +762 @@
             img_write_item(pimg_out, img_LINE, l->flags, l->prefix,
                            X + dX, 0, l->to->p.z);
             l->fDone = 1;
-            do_stn(l->to, X + dX, l->prefix, dir, (l->broken & BREAK_TO));
+            do_stn(p, l->to, X + dX, l->prefix, dir, (l->broken & BREAK_TO));
             l = lp;
          }
       }