From: ian <ian>
Date: Sun, 22 Mar 2009 19:46:45 +0000 (+0000)
Subject: wip new testphys
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ijackson/git?a=commitdiff_plain;h=480a21f5b9676e6f7649beaaf9fee95dbe53cc4b;p=trains.git

wip new testphys
---

diff --git a/layout/Makefile b/layout/Makefile
index abe2083..4ca49ec 100644
--- a/layout/Makefile
+++ b/layout/Makefile
@@ -26,7 +26,8 @@ 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_S) $(LAYERS_M)
+LAYERS=		$(LAYERS_L) $(LAYERS_E) $(LAYERS_S) $(LAYERS_M) \
+		testphys-a.ps testphys-m4.ps
 
 LPAGES=	 $(foreach x, 0 1 2 3 4 5 6, $(foreach y, 1 2 3 4 5, ours-p4-$xx$y.ps))
 
@@ -44,7 +45,7 @@ for-test-ui:	client 							\
 		ours.redacted.neato.ps ours.redacted.shellvars		\
 		ours.summary.neato.ps
 
-layers:		$(LAYERS) testphys-a.ps
+layers:		$(LAYERS)
 lpages:		$(LPAGES)
 tpages:		$(foreach x, 0 1 2, testphys-p0-$xx0.ps)
 extras:		ours-a.ps ours-al.ps dualjn-a.ps parts.ps
@@ -101,6 +102,8 @@ compose-segenco: compose-segenco.o
 			reversers.pin-info detectors.pin-info
 		./$(filter-out %.pin-info, $^) $o
 
+ours.layout-data.c:
+
 %+pindata.asm:	%.layout-data.c
 		@:
 
@@ -149,6 +152,9 @@ ours.graph.c:	extractgraph ours.dgram-bot.p0.segenco.ps
 ours-l%.ps:	ours.d4 layout
 		$(LAYOUT) <$< -l$* $(LAYOUTOPTS) $(XLAYOUTOPTS_LAYER) $o
 
+testphys-l%.ps:	testphys.d4 layout
+		$(LAYOUT) <$< -l$* $(LAYOUTOPTS) $(XLAYOUTOPTS_LAYER) $o
+
 ours-s%.ps:	layout ours.redacted.segjoins ours.d4
 		$(LAYOUT) -l$* -e'*=*rldm' -E'=5QE' -e'segjoin=5M' \
 			-e'l=*C' \
@@ -158,6 +164,10 @@ ours-m%.ps:	ours.d4 layout
 		$(LAYOUT) <$< -l$* -E'=*aRsclDmno' \
 			-E'=5RNLDA' -E'*~=5rCdsml' $(LAYOUTOPTS_PS) $o
 
+testphys-m%.ps:	testphys.d4 layout
+		$(LAYOUT) <$< -l$* -E'=*aRsclDmno' \
+			-E'=5RNLDA' -E'*~=5rCdsml' $(LAYOUTOPTS_PS) $o
+
 ours-e%.ps:	ours.d4 layout
 		$(LAYOUT) <$< -l$* -E'=*aRsclMno' \
 			-e'=5RN' -E'*~=5rsm' -e'p~=5r' -e'*=*l' \
diff --git a/layout/testphys.m4 b/layout/testphys.m4
index 8e7e876..e164bba 100644
--- a/layout/testphys.m4
+++ b/layout/testphys.m4
@@ -2,17 +2,24 @@
 
 include(`parts.i4')
 
+layer 4
+
+abs begin 200 300 0
+extend begin pt_c len 200
+part pt pt_peco_ml c
+
 layer 0
+extend pt_a xb_a len 500
 
-abs c0 200 100 15
-extend -c0 -c1 len 150 230
-part pt pt_peco_sl c c0
+layer 8
+rel xb_a xe_b 250
+rel xb_a xb_b 0 -37
 
-extend pt_a a1 len 150 230
-extend a1 a2 len 50 -315
-extend a2 a3 len 50 -315
+join pt_b xb_b 315 arcline
+join xb_b xe_b 315
+extend xe_b e_b len 200
 
-extend pt_b b1 len 300 230
-extend b1 b2 len 50 -315
-extend b2 b3 len 50 -315
-extend b3 b4 len 50 -315
+layer 0
+rel xe_b xe_a 0 -37
+join xb_a xe_a 315
+extend xe_a e_a len 200