number rather than name a movposcombinfo's segmentlinks

diff --git a/layout/data2safety b/layout/data2safety
index 95c1eb9666b95d62ea16c68525e7bfbf30251dda..bfb7330b3bb93512fa922e7f24bf8093b720f241 100755 (executable)
--- a/layout/data2safety
+++ b/layout/data2safety
@@ -493,11 +493,12 @@ sub writeout () {
                              ($comb / $featr->{Weight}) % $featr->{Posns});
            }
            o("$delim\n");
-           o(sprintf " { %-7s%4d",
+           o(sprintf " { %-7s%4d, { ",
              '"'.$pi.'",',
              $segr->{Dist}[$comb]);
            for ($end=0; $end<2; $end++) {
-               o(", {");
+               o(", ") if $end;
+               o("{");
                $otherend= $segr->{Ends}[$comb][$end];
                defined $otherend or die "$seg $comb $end ?";
                ($node,$side) = @$otherend;
@@ -515,7 +516,7 @@ sub writeout () {
                }
                o(" }");
            }
-           o(sprintf " }");
+           o(sprintf " } }");
            $delim= ',';
 
            $pcname= "$seg/$pi";

diff --git a/layout/layout-data.h b/layout/layout-data.h
index 6688c1b440ed55645162a14a17dd6435b6a0092f..12db14de1e194f620af40c73141c2f3bef990abd 100644 (file)
--- a/layout/layout-data.h
+++ b/layout/layout-data.h
@@ -48,7 +48,7 @@ typedef struct {
 typedef struct {
   const char *pname;
   Distance dist;
-  SegmentLinkInfo backwards, forwards;
+  SegmentLinkInfo link[2]; /* 0: forwards; 1: backwards */
 } SegPosCombInfo;
 
 typedef struct {