annotate layers correctly

diff --git a/layout/ours.m4 b/layout/ours.m4
index df2da572438ff13d950798a0b29fa0a03b0f6682..f714fa6dda4e00c57d92df44f179d05a6dcba2ce 100644 (file)
--- a/layout/ours.m4
+++ b/layout/ours.m4
@@ -2,8 +2,6 @@
 
 include(`parts.i4')
 
-layer 10
-
 define(`pt_main_r',`pt_peco_mr')
 
 defobj dualjn_peco_r
@@ -31,6 +29,8 @@ enddef
 
 #---------- main line figure-of-8
 
+layer 0
+
 abs midx_x_m 930 700 90
 part midx_x cross_peco_s m
 
@@ -40,6 +40,8 @@ part top_0rm ^pt_main_r b
 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
+
+layer 2
 rel top_2lk top_3lk 0 -37
 rel top_3lk top_45x_br 30 -37 -2
 
@@ -47,6 +49,7 @@ layer s
 rel top_3lk top_5_ref 0 -74
 layer =
 
+layer 0
 extend -midx_x_bl -midx_sc_a len 10 315
 part midx_sc pt_peco_sl a
 
@@ -81,7 +84,7 @@ rel rim_2t rim_3t 0 -37
 
 #---------- box
 
-layer l5
+layer l*
 
 extend bot_3lk sq_bl_o upto leb_3k
 rel sq_bl_o sq_bl_i 0 0 -90
@@ -99,7 +102,7 @@ extend sq_br_i sq_bl_o2 upto sq_bl_o
 
 #---------- bottom junction between main loop, main-8
 
-layer 10
+layer 0
 
 rel sq_br_i bot_2rk_c 315
 
@@ -123,15 +126,19 @@ join bot_0rj_a -bot_1lj_a 315
 
 #---------- station branch curve
 
-layer 10
-
+layer 5
 rel sq_tl_i -top_4le 352 37 180
 rel -top_4le -top_5le 0 37
+
+layer 8
 extend -top_4le leb_4e ang 90 -315
 extend -top_5le leb_5e ang 90 -352
 
+layer 2
 join -leb_3k top_3lk 389 arcsline
 join -leb_2k top_2lk 352 arcsline
+
+layer 0
 join -leb_0k top_0lm_c 315 arcsline
 
 #extend leb_3k leb_3b ang 30 389
@@ -142,18 +149,20 @@ join -leb_0k top_0lm_c 315 arcsline
 #extend -top_2lk -leb_2a ang 60 -352
 #extend -top_0lm_c -leb_0a ang 60 -315
 
+layer 2
 part top_45x scis_shino br
 join top_5le top_45x_bl 450 twoarcs
 join top_4le top_45x_br 450 twoarcs
 
 #---------- top main-line/station junction
 
+layer 2
+
 rel top_0rme1 -top_2j_c 0 -37
 part top_2j pt_peco_ll c
 join top_2lk -top_2j_b 600
 
 extend top_2j_a -top_34jx_tr len 50
-#-1450
 part top_34jx cross_peco_l tr
 join top_3lk top_34jx_br 450
 
@@ -252,14 +261,19 @@ join leb_4y_b -sta_3sc_a 230
 extend sta_3neare sta_3y0_c uptoang 5 -230
 part sta_3y0 pt_peco_sl c
 
+layer 8
 extend sta_3sc_b -leb_0sc uptoang 90 300
 
 # junctions
 
+layer 10
 extend sta_3y0_b sta_0y1_c ang 1 -230
 part sta_0y1 pt_peco_sl c
+
+layer 12
 extend sta_0y1_b h_8b ang 90 -230
 
+layer 10
 rel sta_4neare sta_3nears 280 -46
 part sta_3y1 pt_peco_sl c sta_3y0_a
 join sta_3y1_a sta_3nears 450