faffing with dual jn, too hard

diff --git a/layout/dualjn.m4 b/layout/dualjn.m4
new file mode 100644 (file)
index 0000000..f5337d0
--- /dev/null
+++ b/layout/dualjn.m4
@@ -0,0 +1,25 @@
+include(parts.i4)
+
+abs pt_i_c 600 800 130
+part pt_i pt_peco_cl c
+extend pt_i_a x_bl ang 1 -315
+# len 0.0001
+# 30
+part x cross_peco_l bl
+#part x cross_mythical bl
+extend -x_br -pt_o_b ang 0.0030 315
+part pt_o pt_peco_ml b
+
+extend x_tl o_end uptoang 180 -315
+
+#extend pt_i_b i_end uptoang 180 -315
+rel o_end i_end 0 -37
+#extend pt_i_b i_mid upto x_tl
+#extend -i_end -i_mid_ ang 60 315
+#join pt_i_b i_end 315
+
+extend x_tr si_end uptoang 180 -315
+extend -pt_i_c -i_begin uptoang 180 315
+extend -pt_o_c -o_begin uptoang 180 315
+#extend pt_o_a so_end uptoang 180 -315
+rel si_end so_end 0 37

diff --git a/layout/layout b/layout/layout
index fc8f519bbe86851ed89e28f89aded1cfa6e03a46..d4f0ddff3bbfa38c3a1b5e73ead5f776d8c81925 100755 (executable)
--- a/layout/layout
+++ b/layout/layout
@@ -955,17 +955,20 @@ while (@ARGV && $ARGV[0] =~ m/^\-/) {
        elsif (s/^D//) { $debug++; }
        elsif (s/^q//) { $quiet=1; }
        elsif (s/^([Ee])([a-zA-Z]+)//) {
-           my ($ee,$c);
+           my ($ee,$c,@c,$cc);
            $ee= $1;
            foreach $c (split //, $2) {
                if ($ee eq 'e') {
                    die "bad -e option $c" unless defined $chdraw_emap{$c};
-                   $c= $chdraw_emap{$c};
+                   @c= split //, $chdraw_emap{$c};
                } else {
                    die "bad -E option $c" unless $c =~ m/[$drawers]/i;
+                   @c= ($c);
+               }
+               foreach $cc (@c) {
+                   $ctx->{Draw} =~ s/$cc//ig;
+                   $ctx->{Draw} .= $cc if $cc =~ m/[A-Z]/;
                }
-               $ctx->{Draw} =~ s/$c//ig;
-               $ctx->{Draw} .= $c if $c =~ m/[A-Z]/;
            }
        } else {
            die "unknown option -$_";