main fig 8 joins

diff --git a/layout/ours.m4 b/layout/ours.m4
index 7a171021b0b69ba50ad531ee8b092e23c036aab0..7e39a0e751ab4bf78218889698c2ca4f02b22803 100644 (file)
--- a/layout/ours.m4
+++ b/layout/ours.m4
@@ -55,19 +55,10 @@ rel l2_lst l3_lst 0 -37
 rel -l0_jbl_c l2_pbl 0 -37
 rel l2_pbl l3_pbl 0 -37
 
-extend -l0_jtr_c l0_rst uptoang -90 315
-rel l0_rst l2_rst 0 -37
-rel l2_rst l3_rst 0 -37
-
-extend -l0_jtr_c l0p_dj parallel demos!dualjn_tr_ic 315
-rel l0p_dj -l23_dj_ic 0 -37
-part l23_dj ^dualjn_peco_r ic
-
-extend l23_dj_oa l3_sh uptoang 180 -315
-
-extend -midx_br -midx_br_x ang 7.6 315
-extend -midx_br_x -l0_jbr_b parallel demos!right_main_down -315
-part l0_jbr pt_main_r b
+layer s
+extend -midx_br -demo_midx_br_x ang 7 316
+extend -demo_midx_br_x -demo_l0_jbr_b parallel demos!right_main_down -316
+part demo_l0_jbr pt_main_r b
 
 #extend l0_rst l0_rsb upto l0_lst
 #extend l0_rsb l0_jbr_c uptoang 180 315
@@ -75,8 +66,25 @@ part l0_jbr pt_main_r b
 #join l0_jbr_b midx_br 315 arcline
 #extend l0_jbr_b l0_test ang 135 315
 
-layer l5
-extend l0_jbl_a l0_jbr_c_other upto l0_jbr_c
+layer l
+extend l0_jbl_a -l0_jbr_c upto demo_l0_jbr_c
+
+layer =
+part l0_jbr pt_main_r c
+extend -l0_jtr_c -l0_jtre upto l0_jbr_c
+join l0_jbr_b midx_br 315
+
+extend -l0_jtre l0_rst uptoang -90 315
+rel l0_rst l2_rst 0 -37
+rel l2_rst l3_rst 0 -37
+
+extend -l0_jbr_c -l0_rsb uptoang 90 -315
+
+extend -l0_jtre l0p_dj parallel demos!dualjn_tr_ic 315
+rel l0p_dj -l23_dj_ic 0 -37
+part l23_dj ^dualjn_peco_r ic
+
+extend l23_dj_oa l3_sh uptoang 180 -315
 
 #---------- box