fix some senses and tidy some stuff

diff --git a/layout/ours.m4 b/layout/ours.m4
index 2915c7282f8bc6848765e7cbe3051dae63f22605..2acb5912426f885a77f2f5734b9484dab329c200 100644 (file)
--- a/layout/ours.m4
+++ b/layout/ours.m4
@@ -39,8 +39,7 @@ extend midx_x_tl -top_0lm_b parallel demos!-right_main_down -315
 part top_0lm pt_main_r b
 rel top_0lm_c top_2lk 0 -37
 rel top_2lk top_3lk 0 -37
-rel top_3lk top_4lk 0 -37
-rel top_4lk top_5lk 0 -37
+rel top_3lk top_45x_bl 30 -74
 
 extend -midx_x_bl -midx_sc_a len 10 315
 part midx_sc pt_peco_sl a
@@ -48,9 +47,9 @@ part midx_sc pt_peco_sl a
 extend -midx_sc_c -bot_0lk_b parallel demos!right_main_up 315
 part bot_0lk ^pt_main_r b
 
-extend -bot_0lk_c leb_0k uptoang 90 315
-rel leb_0k leb_2k 0 -37
-rel leb_2k leb_3k 0 -37
+extend -bot_0lk_c -leb_0k uptoang 90 315
+rel -leb_0k -leb_2k 0 -37
+rel -leb_2k -leb_3k 0 -37
 
 rel -bot_0lk_c bot_2lk 0 -37
 rel bot_2lk bot_3lk 0 -37
@@ -75,9 +74,9 @@ rel rim_2t rim_3t 0 -37
 extend -bot_0rk_c -rim_0b uptoang 90 -315
 
 extend -top_0rme 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
+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
 
@@ -86,7 +85,7 @@ layer l5
 extend bot_3lk sq_bl_o upto leb_3k
 rel sq_bl_o sq_bl_i 0 0 -90
 
-extend sq_bl_i sq_tl_o upto top_5lk
+extend sq_bl_i sq_tl_o upto top_45x_bl
 rel sq_tl_o sq_tl_i 0 0 -90
 
 extend sq_tl_i sq_tr_o upto rim_3t
@@ -125,20 +124,26 @@ join bot_0rj_a -bot_1lj_a 315
 
 layer 10
 
-rel sq_tl_i top_4le 352 37 180
-rel top_4le top_5le 0 37
-extend top_4le leb_4e ang 90 -315
-extend top_5le leb_5e ang 90 -352
+rel sq_tl_i -top_4le 352 37 180
+rel -top_4le -top_5le 0 37
+extend -top_4le leb_4e ang 90 -315
+extend -top_5le leb_5e ang 90 -352
 
-extend leb_3k leb_3b ang 30 389
-extend leb_2k leb_2b ang 30 352
-extend leb_0k leb_0b ang 30 315
+join -leb_3k top_3lk 389 arcsline
+join -leb_2k top_2lk 352 arcsline
+join -leb_0k top_0lm_c 315 arcsline
 
-extend -top_3lk -leb_3a ang 60 -389
-extend -top_2lk -leb_2a ang 60 -352
-extend -top_0lm_c -leb_0a ang 60 -315
+#extend leb_3k leb_3b ang 30 389
+#extend leb_2k leb_2b ang 30 352
+#extend leb_0k leb_0b ang 30 315
 
-part top_45x scis_shino tl top_4le
+#extend -top_3lk -leb_3a ang 60 -389
+#extend -top_2lk -leb_2a ang 60 -352
+#extend -top_0lm_c -leb_0a ang 60 -315
+
+part top_45x scis_shino bl
+join top_5le top_45x_bl 450 twoarcs
+join top_4le top_45x_br 450 twoarcs
 
 #---------- station