wrong place for hj

diff --git a/layout/ours.m4 b/layout/ours.m4
index 7fd86ee29e27ce582dbbcf93266aa575183cde69..65059411133748b8cab260d6890f46c2ad42f682 100644 (file)
--- a/layout/ours.m4
+++ b/layout/ours.m4
@@ -1,10 +1,22 @@
 include(`parts.i4')
 
-abs midx_m 830 500 90
+abs midx_m 930 500 90
 part midx cross_peco_l m
 
 define(`pt_main_r',`pt_peco_mr')
 
+defobj dualjn_peco_r
+  abs ic 200 200 0
+  part pt_i pt_peco_lr c ic
+  part x cross_peco_l br pt_i_a
+  part pt_o pt_peco_lr b x_bl
+  rel pt_o_c oc
+  rel x_tl ia
+  extend pt_o_a oa upto ia
+  rel x_tr ob
+  rel pt_i_b ib
+enddef
+
 defobj demos
   abs right 200 200 0
   part main_up   ^pt_main_r c right b right_main_up
@@ -12,10 +24,11 @@ defobj demos
   abs up 200 200 90
   part main_left  ^pt_main_r c up b up_main_left
   part main_right  pt_main_r c up b up_main_right
+  part dualjn_tr ^dualjn_peco_r ib -right
 enddef
 
-abs demos_right 200 1200 0
-part demos demos right
+#abs demos_right 200 1200 0
+#part demos demos right
 
 extend midx_tr -l0_jtr_b parallel demos!right_main_up 315
 part l0_jtr ^pt_main_r b
@@ -25,25 +38,22 @@ part l0_jtl pt_main_r b
 extend -l0_jtl_c -l0_lst uptoang -90 -315
 rel l0_lst l2_lst 0 -37
 rel l2_lst l3_lst 0 -37
+rel l3_lst l4_lst 0 -37
+rel l4_lst l5_lst 0 -37
+
+part hj pt_peco_sr a l0_lst
+extend -hj_c l0_jbl_c uptoang 0 -315
 
 extend -l0_jtr_c l0_rst uptoang -90 315
 rel l0_rst l2_rst 0 -37
+rel l2_rst l3_rst 0 -37
 
-defobj dualjn_peco_r
-  abs ic 200 200 0
-  part pt_i pt_peco_lr c ic
-  part x cross_peco_l br pt_i_a
-  part pt_o pt_peco_lr b x_bl
-  rel pt_o_c oc
-  rel x_tl ia
-  extend pt_o_a oa upto ia
-  rel x_tr ob
-  rel pt_i_b ib
-enddef
+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
 
 #rel l0_rst -l23_dj_ic 37 -37
-rel -l0_jtr_c -l23_dj_ic 37 -37 -8
-part l23_dj ^dualjn_peco_r ic
+#rel -l0_jtr_c -l23_dj_ic 37 -37 -8
 extend l23_dj_oa l3_sh uptoang 180 -315
 
 
@@ -58,35 +68,3 @@ extend l23_dj_oa l3_sh uptoang 180 -315
 #part l3_jr pt_peco_ll c
 
 eof
-rel lst1 lst2 0 -37
-rel lst2 lst3 0 -37
-
-extend midx_tr trj0_b parallel dem_trjp_b 315
-
-obj pt_peco_ml -trj0_b b trj0_
-obj pt_peco_mr -trj0_c c trj0b_
-extend trj0b_a trj1_b ang 60 315
-#extend -trj0_c trj1_b ang 60 315
-obj pt_peco_ml -trj1_b b trj1_
-
-#obj cross_peco_s trj0_b br trj0_
-#extend trj0_tr rst0 uptoang -90 315
-#rel rst0 rst1 0 -37
-#rel rst1 rst2 0 -37
-#rel rst2 rst3 0 -37
-
-#extend trj0_tl trj1_b_ uptoang 14 315
-#obj pt_peco_ml -trj1_b_ b trj1_
-
-#extend -trj1_c rst1b uptoang -90 315
-extend -trj1_c rst1b uptoang -90 315
-rel rst1b rst2b 0 -37
-rel rst2b rst3b 0 -37
-
-
-#join tlj0_a trj0_bl 0
-
-#obj cross_peco_s 
-
-#obj pt_peco_mr tlj_cross_i_bl b tlj_pt_o_
-#obj pt_peco_mr -tlj_pt_i_b_ b tlj_pt_i_