From: ian <ian>
Date: Sun, 25 Jan 2004 15:20:26 +0000 (+0000)
Subject: slightly smaller scale, do not back-define point formal arg
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ijackson/git?a=commitdiff_plain;h=156d9e17b6f438b3180ec7d142125570aeab0ce0;p=trains.git

slightly smaller scale, do not back-define point formal arg
---

diff --git a/layout/layout b/layout/layout
index b4a1e89..c509ecc 100755
--- a/layout/layout
+++ b/layout/layout
@@ -255,6 +255,8 @@ sub dv {
     }
 }		    
 
+$ptscale= 72/25.4 / 7.0;
+
 $psu_ulen= 4.5;
 $psu_edgelw= 0.5;
 $psu_ticklw= 0.1;
@@ -267,11 +269,11 @@ $psu_sleeperlw= 15;
 $psu_raillw= 1.0;
 
 $lmu_marklw= 4;
-$lmu_marktpt= 9;
-$lmu_txtboxtxty= $lmu_marktpt * 0.30;
-$lmu_txtboxh= $lmu_marktpt * 1.0;
-$lmu_txtboxpadx= 3;
-$lmu_txtboxoff= $lmu_marklw/2;
+$lmu_marktpt= 11;
+$lmu_txtboxtxty= $lmu_marktpt * 0.300;
+$lmu_txtboxh= $lmu_marktpt * 1.100;
+$lmu_txtboxpadx= $lmu_marktpt * 0.335;
+$lmu_txtboxoff= $lmu_marklw / 2;
 $lmu_txtboxlw= 1;
 
 sub o ($) { $o .= $_[0]; }
@@ -557,6 +559,7 @@ dv("cmd__obj $obj_id ",'$ctx',$ctx);
     $ctx= $ctx_save;
     if (length $pfx) {
 	foreach $id (keys %{ $ctx_inobj->{Loc} }) {
+	    next if $id eq $formal_id;
 	    $newid= $pfx.$id;
 	    next if exists $ctx_save->{Loc}{$newid};
 	    $newpt= cva_idnew($newid);
@@ -611,8 +614,6 @@ sub cmd__one {
     cmd__do();
 }
 
-$ptscale= 72/25.4 / 5.0;
-
 print
     "%!\n".
     "  /lf /Courier-New findfont $lmu_marktpt scalefont def\n".
diff --git a/layout/testobj b/layout/testobj
index eab887d..046bc60 100644
--- a/layout/testobj
+++ b/layout/testobj
@@ -12,7 +12,7 @@ extend rf rc ang -15 315
 
 obj po s a po_
 
-extend po_a pr len 100
+extend s pr len 100
 
 #objflip po po_c b pof_