proper revision ids etc.

diff --git a/layout/Makefile b/layout/Makefile
index 3cfb7ea8dc26ce532c055ee47d87eda60839fe4f..cfc43b0336a692249c11d47b76b4c49b3b0919fd 100644 (file)
--- a/layout/Makefile
+++ b/layout/Makefile
@@ -17,8 +17,9 @@ LAYERS_LS=    0 4 10 26 30
 LAYERS_PS=     $(addsuffix .ps, $(LAYERS_LS))
 LAYERS_L=      $(addprefix ours-l, $(LAYERS_PS))
 LAYERS_E=      $(addprefix ours-e, $(LAYERS_PS)) ours-e20.ps
+LAYERS_S=      $(addprefix ours-s, $(LAYERS_PS))
 LAYERS_M=      $(addprefix ours-m, $(LAYERS_PS))
-LAYERS=                $(LAYERS_L) $(LAYERS_E) $(LAYERS_M)
+LAYERS=                $(LAYERS_L) $(LAYERS_E) $(LAYERS_S) $(LAYERS_M)
 
 LPAGES=         $(foreach x, 0 1 2 3 4 5 6, $(foreach y, 1 2 3 4 5, ours-p4-$xx$y.ps))
 
@@ -128,6 +129,7 @@ ours-l%.ps: ours.d4 layout
 
 ours-s%.ps:    layout ours.redacted.segjoins ours.d4
                ./layout -l$* -e'*=*rldm' -E'=5QE' -e'segjoin=5M' \
+                       -e'l=*C' \
                        $(filter-out layout, $^) $o
 
 ours-m%.ps:    ours.d4 layout

diff --git a/layout/layout b/layout/layout
index f6d9cc0beb6d4406598ee18d95d599fec9b86a61..72fc31b3fc70f9107d0bf71ffddf4b0e0b2da79b 100755 (executable)
--- a/layout/layout
+++ b/layout/layout
@@ -640,7 +640,7 @@ sub o_path_strokeonly () {
     o("      stroke\n");
 }
 
-sub o_transform ($) {
+sub o_gsave_transform ($) {
     my ($pt) = @_;
     my ($ad);
     $ad= ang2deg($pt->{A});
@@ -919,8 +919,7 @@ print DEBUG "ps $p0 $p1 $lenperp ($ppu)\n";
        $pt= &$calcfn;
        $len= sprintf "%.0f", $lenperp * abs($p1-$p0);
        $off= $draw =~ m/C/ ? $lmu_lenlabeloff : $lmu_lenlabeloffctr;
-       ol("      gsave\n");
-       o_transform($pt);
+       o_gsave_transform($pt);
        ol("        lf setfont\n".
           "        0 $off moveto\n".
           "        ($len) show\n".
@@ -1761,8 +1760,7 @@ while (<>) {
     my ($seg, $pt);
     foreach $seg (keys %seggraphbest) {
        $pt= $seggraphbest{$seg};
-       ol("    gsave\n");
-       o_transform($pt);
+       o_gsave_transform($pt);
        ol("      /s ($seg >) def\n".
           "      sf setfont\n".
           "      0 0 moveto\n".

diff --git a/layout/redactgraph.c b/layout/redactgraph.c
index e2c49f2a5dca384a29a63f5e002be9669a4b4cc7..0e1c60d4a88915f435a1a1a98a4127d0b985dff5 100644 (file)
--- a/layout/redactgraph.c
+++ b/layout/redactgraph.c
@@ -783,7 +783,6 @@ static void printforlayoutsegjoins(void) {
     assert(!(colour & ~LSJ_U_COLOUR_MASK));
    something_done:
     any_left= 0;
-
     FOR_ALL_SEGMENTS(segmentp,segment)
       segment->u &= ~LSJ_U_COLOUR_CLASH;
 
@@ -821,7 +820,7 @@ static void printforlayoutsegjoins(void) {
 
   FOR_ALL_SEGMENTS(segmentp,segment) {
     int tcolour= segment->u & LSJ_U_COLOUR_MASK;
-    const double val1=0.75, val2=0.50;
+    const double val1=0.60, val2=0.35;
     double value;
     if (!tcolour) continue;
     value= val1 +