reflow some code in lib/ortho

diff --git a/lib/ortho/partition.c b/lib/ortho/partition.c
index bd0eacb7dd42df0bd7f8de8606174a147e6ae7a7..0146606da5800b15575beebbad9ca852edf493b9 100644 (file)
--- a/lib/ortho/partition.c
+++ b/lib/ortho/partition.c
@@ -305,8 +305,7 @@ make_new_monotone_poly (int mcur, int v0, int v1)
   vp1->nextfree++;
 
 #if DEBUG > 0
-  fprintf(stderr, "make_poly: mcur = %d, (v0, v1) = (%d, %d)\n", 
-         mcur, v0, v1);
+  fprintf(stderr, "make_poly: mcur = %d, (v0, v1) = (%d, %d)\n", mcur, v0, v1);
   fprintf(stderr, "next posns = (p, q) = (%d, %d)\n", p, q);
 #endif
 

diff --git a/lib/ortho/trapezoid.c b/lib/ortho/trapezoid.c
index a20713f15b58a52552c0627f68f97251f1349091..6ede97fece2436862607f841c6a6db92cc079bf3 100644 (file)
--- a/lib/ortho/trapezoid.c
+++ b/lib/ortho/trapezoid.c
@@ -558,8 +558,7 @@ add_segment (int segnum, segment_t* seg, trap_t* tr, qnode_t* qs)
 
   t = tfirst;                  /* topmost trapezoid */
 
-  while (t > 0 &&
-        _greater_than_equal_to(&tr[t].lo, &tr[tlast].lo))
+  while (t > 0 && _greater_than_equal_to(&tr[t].lo, &tr[tlast].lo))
                                /* traverse from top to bot */
     {
       int t_sav, tn_sav;
@@ -645,11 +644,9 @@ add_segment (int segnum, segment_t* seg, trap_t* tr, qnode_t* qs)
            {                   /* fresh seg. or upward cusp */
              int tmp_u = tr[t].u0;
              int td0, td1;
-             if ((td0 = tr[tmp_u].d0) > 0 &&
-                 (td1 = tr[tmp_u].d1) > 0)
+             if ((td0 = tr[tmp_u].d0) > 0 && (td1 = tr[tmp_u].d1) > 0)
                {               /* upward cusp */
-                 if (tr[td0].rseg > 0 &&
-                     !is_left_of(tr[td0].rseg, seg, &s.v1))
+                 if (tr[td0].rseg > 0 && !is_left_of(tr[td0].rseg, seg, &s.v1))
                    {
                      tr[t].u0 = tr[t].u1 = tr[tn].u1 = -1;
                      tr[tr[tn].u0].d1 = tn;
@@ -753,11 +750,9 @@ add_segment (int segnum, segment_t* seg, trap_t* tr, qnode_t* qs)
            {                   /* fresh seg. or upward cusp */
              int tmp_u = tr[t].u0;
              int td0, td1;
-             if ((td0 = tr[tmp_u].d0) > 0 &&
-                 (td1 = tr[tmp_u].d1) > 0)
+             if ((td0 = tr[tmp_u].d0) > 0 && (td1 = tr[tmp_u].d1) > 0)
                {               /* upward cusp */
-                 if (tr[td0].rseg > 0 &&
-                     !is_left_of(tr[td0].rseg, seg, &s.v1))
+                 if (tr[td0].rseg > 0 && !is_left_of(tr[td0].rseg, seg, &s.v1))
                    {
                      tr[t].u0 = tr[t].u1 = tr[tn].u1 = -1;
                      tr[tr[tn].u0].d1 = tn;
@@ -891,11 +886,9 @@ add_segment (int segnum, segment_t* seg, trap_t* tr, qnode_t* qs)
            {                   /* fresh seg. or upward cusp */
              int tmp_u = tr[t].u0;
              int td0, td1;
-             if ((td0 = tr[tmp_u].d0) > 0 &&
-                 (td1 = tr[tmp_u].d1) > 0)
+             if ((td0 = tr[tmp_u].d0) > 0 && (td1 = tr[tmp_u].d1) > 0)
                {               /* upward cusp */
-                 if (tr[td0].rseg > 0 &&
-                     !is_left_of(tr[td0].rseg, seg, &s.v1))
+                 if (tr[td0].rseg > 0 && !is_left_of(tr[td0].rseg, seg, &s.v1))
                    {
                      tr[t].u0 = tr[t].u1 = tr[tn].u1 = -1;
                      tr[tr[tn].u0].d1 = tn;