From d1482942499c21f2053961e96f7abba166bd6099 Mon Sep 17 00:00:00 2001
From: Adam Megacz <adam.megacz@sun.com>
Date: Fri, 17 Jul 2009 10:17:15 +0000
Subject: [PATCH] works

---
 electric/omegaCounter.jelib |   77 ++++++++++++++++++-------------------------
 1 file changed, 32 insertions(+), 45 deletions(-)

diff --git a/electric/omegaCounter.jelib b/electric/omegaCounter.jelib
index f835da4..2b5d1a2 100644
--- a/electric/omegaCounter.jelib
+++ b/electric/omegaCounter.jelib
@@ -86,7 +86,7 @@ Eout||D5G2;|conn@0|y|O
 X
 
 # Cell fire;1{ic}
-Cfire;1{ic}||artwork|1247529105994|1247689184569|E
+Cfire;1{ic}||artwork|1247529105994|1247821732878|E
 Ngeneric:Facet-Center|art@0||0|0||||AV
 NBox|art@2||-3.25|2|11.5|15||
 NThick-Circle|art@3||-7.5|-6|1|1|RRR|
@@ -128,7 +128,6 @@ Nschematic:Wire_Pin|pin@34||-7.5|12||||
 Nschematic:Wire_Pin|pin@35||-7.5|10.5||||
 Nschematic:Wire_Pin|pin@36||1.5|-8||||
 Ngeneric:Invisible-Pin|pin@37||-7.5|8.5|||||ART_message(D5G1;)S+1
-Nschematic:Bus_Pin|pin@38||-1.5|9.5||||
 Nschematic:Bus_Pin|pin@40||-5|9.5||||
 Nschematic:Wire_Pin|pin@41||-5|9.5||||
 Aschematic:wire|net@0|||1800|pin@1||2.5|1|pin@0||4.5|1
@@ -157,23 +156,22 @@ ENotMSN[ZeroOrOne]|NotMSN[ZeroOrTwo]|D4G2;|pin@14||I
 Enot_disable@174670546|disable|D5G2;RX-1;Y5;|pin@40||I
 Efire|fire[1]|D5G2;X1.5;|pin@16||O
 Efire[2]||D5G2;X2;Y-3.5;|pin@31||O
-Enot_disable||D5G2;RX-0.5;Y3.5;|pin@38||I
 Enot_fire|not_fire[1]|D5G2;X1;Y-4.5;|pin@19||O
 Enot_fire[2]||D5G2;X-5.5;Y1.5;|pin@33||O
 X
 
 # Cell fire;1{sch}
-Cfire;1{sch}||schematic|1247526811643|1247810782419|
-IredFive:NMOS;1{ic}|NMOS@0||8|-51|RR||D5G4;|ATTR_X(D5G1.5;NPX-3.5;Y2;)S8
-IredFive:NMOS;1{ic}|NMOS@1||-1|-44.5|RR||D5G4;|ATTR_X(D5G1.5;NPX-3.5;Y2;)S8
-IredFive:NMOS;1{ic}|NMOS@2||-14|-41.5|||D5G4;|ATTR_X(D5G1.5;NPX5;Y0.5;)S16
-IredFive:NMOS;1{ic}|NMOS@5||-26|-26.5|||D5G4;|ATTR_X(D5G1.5;NPX5;Y0.5;)S8
-IredFive:NMOS;1{ic}|NMOS@7||-14|-47.5|||D5G4;|ATTR_X(D5G1.5;NPX5;Y0.5;)S16
-IredFive:PMOS;1{ic}|PMOS@0||-6.5|-14|RR||D5G4;|ATTR_X(D5G1.5;NPX-3;Y2;)S16
-IredFive:PMOS;1{ic}|PMOS@1||-9.5|-14|XRR||D5G4;|ATTR_X(D5G1.5;NPX-3;Y2;)S16
-IredFive:PMOS;1{ic}|PMOS@2||-8|-9.5|RR||D5G4;|ATTR_X(D5G1.5;NPX5.5;Y-2;)S16
-IredFive:PMOS;1{ic}|PMOS@3||-8|-4|RR||D5G4;|ATTR_X(D5G1.5;NPX5;)S16
-IredFive:PMOS;1{ic}|PMOS@4||-8|2|XRR||D5G4;|ATTR_X(D5G1.5;NPX4.5;Y-1;)S500
+Cfire;1{sch}||schematic|1247526811643|1247822403556|
+IredFive:NMOS;1{ic}|NMOS@0||8|-51|RR||D5G4;|ATTR_X(D5G1.5;NPX-3.5;Y2;)S16
+IredFive:NMOS;1{ic}|NMOS@1||-1|-44.5|RR||D5G4;|ATTR_X(D5G1.5;NPX-3.5;Y2;)S16
+IredFive:NMOS;1{ic}|NMOS@2||-14|-41.5|||D5G4;|ATTR_X(D5G1.5;NPX5;Y0.5;)S32
+IredFive:NMOS;1{ic}|NMOS@5||-26|-26.5|||D5G4;|ATTR_X(D5G1.5;NPX5;Y0.5;)S4
+IredFive:NMOS;1{ic}|NMOS@7||-14|-47.5|||D5G4;|ATTR_X(D5G1.5;NPX5;Y0.5;)S32
+IredFive:PMOS;1{ic}|PMOS@0||-6.5|-14|RR||D5G4;|ATTR_X(D5G1.5;NPX-3;Y2;)S32
+IredFive:PMOS;1{ic}|PMOS@1||-9.5|-14|XRR||D5G4;|ATTR_X(D5G1.5;NPX-3;Y2;)S32
+IredFive:PMOS;1{ic}|PMOS@2||-8|-9.5|RR||D5G4;|ATTR_X(D5G1.5;NPX5.5;Y-2;)S32
+IredFive:PMOS;1{ic}|PMOS@3||-8|-4|RR||D5G4;|ATTR_X(D5G1.5;NPX5;)S32
+IredFive:PMOS;1{ic}|PMOS@4||-8|2|XRR||D5G4;|ATTR_X(D5G1.5;NPX4.5;Y-1;)S64
 Ngeneric:Facet-Center|art@0||0|0||||AV
 NOff-Page|conn@0||-50.5|-38||||
 NOff-Page|conn@1||22.5|-37|||RR|
@@ -187,12 +185,11 @@ NOff-Page|conn@8||29|-21||||
 NOff-Page|conn@9||29|-24.5||||
 NOff-Page|conn@10||29|-18.5||||
 NOff-Page|conn@11||29|-27||||
-NOff-Page|conn@12||-58.5|2.5||||
 NOff-Page|conn@14||-56|-26.5|||XRR|
 Ifire;1{ic}|fire@0||-57|22|||D5G4;
 NGround|gnd@1||-26|-32.5||||
 NGround|gnd@2||-8|-61||||
-IredFive:inv;1{ic}|inv@1||20|-24.5|||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPY-4.5;)S8|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
+IredFive:inv;1{ic}|inv@1||20|-24.5|||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPY-4.5;)S16|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
 NWire_Pin|pin@0||-8|-12||||
 NWire_Pin|pin@2||-8|-16||||
 NWire_Pin|pin@5||-8|-21||||
@@ -285,7 +282,6 @@ ENotMSN[ZeroOrOne]|NotMSN[ZeroOrTwo]|D5G2;X-10;|conn@6|a|I
 Enot_disable@228418395|disable|D5G2;X-4;|conn@14|a|I
 Efire|fire[1]|D6G2;X4.5;|conn@8|a|O
 Efire[2]||D5G2;X7;|conn@10|a|O
-Enot_disable||D5G2;X-6;|conn@12|a|I
 Enot_fire|not_fire[1]|D5G2;X9;|conn@9|a|O
 Enot_fire[2]||D5G2;X5;|conn@11|y|O
 X
@@ -618,7 +614,7 @@ EoutaBar||D5G2;X7.5;|conn@3|a|U
 X
 
 # Cell oneBit;1{ic}
-ConeBit;1{ic}||artwork|1242937501096|1247628024012|E
+ConeBit;1{ic}||artwork|1242937501096|1247821340717|E
 Ngeneric:Facet-Center|art@0||0|0||||AV
 NTriangle|art@2||-5|2|3|2|RRR|
 NTriangle|art@3||-5|-8|3|2|RRR|
@@ -636,8 +632,6 @@ Nschematic:Wire_Pin|pin@30||2|-8.5||||
 Nschematic:Bus_Pin|pin@31||-4.5|-11.5||||
 Nschematic:Wire_Pin|pin@32||-4.5|-9.5||||
 NPin|pin@33||4|2|1|1||
-Nschematic:Bus_Pin|pin@36||2|6||||
-Nschematic:Wire_Pin|pin@37||2|4||||
 Nschematic:Bus_Pin|pin@38||-4|6||||
 Nschematic:Wire_Pin|pin@39||-4|4||||
 ASolid|net@0|||FS900|pin@0||-6|4|pin@1||-6|-10
@@ -646,7 +640,6 @@ ASolid|net@2|||FS2700|pin@2||4|-10|pin@3||4|4
 ASolid|net@3|||FS0|pin@3||4|4|pin@0||-6|4
 Aschematic:wire|net@8|||900|pin@30||2|-8.5|pin@29||2|-11.5
 Aschematic:wire|net@9|||900|pin@32||-4.5|-9.5|pin@31||-4.5|-11.5
-Aschematic:wire|net@11|||2700|pin@37||2|4|pin@36||2|6
 Aschematic:wire|net@12|||2700|pin@39||-4|4|pin@38||-4|6
 Esucc[OneOrTwo]|LSN[ZeroOrDone]|D5G1;X5;|pin@17||B
 Esucc[TwoOrEmpty]|LSN[ZeroOrTwo]|D6G1;X1;|pin@16||B
@@ -654,12 +647,11 @@ Epred[OneOrTwo]|MSN[ZeroOrDone]|D4G1;X-1;|pin@18||B
 Epred[TwoOrEmpty]|MSN[ZeroOrTwo]|D4G1;X-1;|pin@9||B
 Edisable||D5G2;X-2.5;|pin@38||I
 Eload_one||D5G2;X2.5;Y-0.5;|pin@29||I
-Enot_disable||D5G2;X4.5;|pin@36||I
 Enot_load_zero||D5G2;X-5.5;Y-0.5;|pin@31||I
 X
 
 # Cell oneBit;1{sch}
-ConeBit;1{sch}||schematic|1242942044308|1247815787309|
+ConeBit;1{sch}||schematic|1242942044308|1247825513770|
 IorangeTSMC090nm:LEload;1{ic}|LEload@0||-96.5|44|XY||D5G4;|ATTR_L(D5G1;OLPUDX1;)S100|ATTR_LEWIRE(P)I1|ATTR_layer(D5G1;NOLPX0.5;Y-1;)S1|ATTR_width(D5G1;NOLPX0.5;Y-2;)S3
 IorangeTSMC090nm:LEload;1{ic}|LEload@1||-96|26.5|X||D5G4;|ATTR_L(D5G1;OLPUDX1;)S100|ATTR_LEWIRE(P)I1|ATTR_layer(D5G1;NOLPX0.5;Y-1;)S1|ATTR_width(D5G1;NOLPX0.5;Y-2;)S3
 IorangeTSMC090nm:LEload;1{ic}|LEload@2||-2.5|11|||D5G4;|ATTR_L(D5G1;OLPUDX1;)S100|ATTR_LEWIRE(P)I1|ATTR_layer(D5G1;NOLPX0.5;Y-1;)S1|ATTR_width(D5G1;NOLPX0.5;Y-2;)S3
@@ -671,7 +663,6 @@ NOff-Page|conn@2||-95|50.5||||
 NOff-Page|conn@3||-1|61||||
 NOff-Page|conn@4||-95.5|76.5||||
 NOff-Page|conn@5||-95.5|73.5||||
-NOff-Page|conn@6||-36.5|83||||
 NOff-Page|conn@7||-36.5|80.5||||
 Ifire;1{ic}|fire@0||-28|36|||D5G4;
 IredFive:inv;1{ic}|inv@9||-60|37.5|R||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX0.5;Y2.5;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
@@ -680,12 +671,11 @@ IredFive:inv;1{ic}|inv@16||-18.5|35|X||D0G4;|ATTR_X(D5G1.5;NPX0.5;Y-3;)S4|ATTR_d
 IredFive:inv;1{ic}|inv@20||-81.5|32.5|XRRR||D0G4;|ATTR_X(D5G1.5;NPX1.5;Y2.5;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
 IredFive:inv;1{ic}|inv@21||-81.5|47|XRRR||D0G4;|ATTR_X(D5G1.5;NPX1.5;Y2.5;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
 IredFive:inv;1{ic}|inv@22||-70|28.5|XR||D0G4;|ATTR_X(D5G1.5;NPX1.5;Y2;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
-IredFive:inv;1{ic}|inv@23||-70|46.5|XR||D0G4;|ATTR_X(D5G1.5;NPX1.5;Y2;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
-IredFive:inv;1{ic}|inv@24||-70|14|XRR||D0G4;|ATTR_X(D5G1.5;NPX1.5;Y2.5;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
 IredFive:inv;1{ic}|inv@25||-76.5|-2.5|XRR||D0G4;|ATTR_X(D5G1.5;NPX1.5;Y2.5;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
-IredFive:inv;1{ic}|inv@26||-77|14|XRR||D0G4;|ATTR_X(D5G1.5;NPX1.5;Y2.5;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
-IredFive:nand2;1{ic}|nand2@0||-18|70.5|YRR||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX2.5;Y2.5;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
+IredFive:inv;1{ic}|inv@31||-74.5|14|XRR||D0G4;|ATTR_X(D5G1.5;NPX1.5;Y2.5;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
+IredFive:inv;1{ic}|inv@32||-67|14|XRR||D0G4;|ATTR_X(D5G1.5;NPX1.5;Y2.5;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
 IredFive:nand2;1{ic}|nand2@1||-54.5|76|X||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX-1.5;Y3;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
+IredFive:nand2LT;1{ic}|nand2LT@0||-18|70.5|YRR||D5G4;|ATTR_Delay(D5G1;NPX2.5;Y-3;)I100|ATTR_X(D5FLeave alone;G1.5;NOLPX4;Y3.5;)S2|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
 IredFive:nms1;2{ic}|nms1@0||-9.5|11|||D5G4;|ATTR_X(D5FLeave alone;G1.5;NPX-2;Y-2.75;)S8
 IredFive:nms1;2{ic}|nms1@1||-9.5|48|X||D5G4;|ATTR_X(D5FLeave alone;G1.5;NPX-1.5;Y2.75;)S8
 IredFive:nor2n;1{ic}|nor2n@0||-60|27.5|R||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX0.5;Y3;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
@@ -720,12 +710,10 @@ NWire_Pin|pin@370||2|30||||
 NWire_Pin|pin@371||-22.5|11||||
 NWire_Pin|pin@372||7.5|48||||
 NWire_Pin|pin@373||-33|71||||
-NWire_Pin|pin@374||-29.5|74.5||||
 NWire_Pin|pin@380||-65|72.5||||
 NWire_Pin|pin@395||-44|49||||
 NWire_Pin|pin@397||-44|49.5||||
 NWire_Pin|pin@401||-33|80.5||||
-NWire_Pin|pin@402||-29.5|83||||
 NWire_Pin|pin@435||-44|44.5||||
 NWire_Pin|pin@457||-44|20||||
 NWire_Pin|pin@463||-60|44.5||||
@@ -786,6 +774,8 @@ NWire_Pin|pin@579||-73.5|60||||
 NWire_Pin|pin@580||-73.5|21||||
 NWire_Pin|pin@581||-45.5|69||||
 NWire_Pin|pin@582||-33.5|69||||
+NWire_Pin|pin@584||-79.5|14||||
+NWire_Pin|pin@585||-75|23||||
 IredFive:pms1;2{ic}|pms1@0||-9.5|80|||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX3.25;Y1;)S8
 IredFive:pms1;2{ic}|pms1@1||-9.5|30|X||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX-2.75;Y3;)S8
 IpredCondMSC;1{ic}|predCond@3||-18|18.5|||D5G4;|ATTR_X(D5G2;NPX0.25;Y-5.25;)S8
@@ -813,15 +803,12 @@ Awire|net@787|||2700|nms1@0|d|-9.5|13|pin@369||-9.5|18.5
 Awire|net@789|||2700|nms1@1|d|-9.5|50|pin@367||-9.5|61
 Awire|net@793|||0|fire@0|MSN[ZeroOrDone]|-39|39|pin@351||-53|39
 Awire|net@795|||2700|fire@0|not_disable@174670546|-33|45.5|pin@373||-33|71
-Awire|net@798|||2700|fire@0|not_disable|-29.5|45.5|pin@374||-29.5|74.5
 Awire|net@809|||1800|pin@353||-65|41|fire@0|MSN[ZeroOrOne]|-39|41
 Awire|net@812|||0|predCond@5|state[1]|-63|72.5|pin@380||-65|72.5
 Awire|net@844|||2700|pin@395||-44|49|pin@397||-44|49.5
 Awire|net@845|||1800|sucDri20@1|cond|-46|49.5|pin@397||-44|49.5
 Awire|net@854|||1800|conn@7|y|-34.5|80.5|pin@401||-33|80.5
 Awire|net@855|||900|pin@401||-33|80.5|pin@373||-33|71
-Awire|net@856|||1800|conn@6|y|-34.5|83|pin@402||-29.5|83
-Awire|net@857|||2700|pin@374||-29.5|74.5|pin@402||-29.5|83
 Awire|net@924|||2700|pin@435||-44|44.5|pin@395||-44|49
 Awire|net@958|||0|pin@457||-44|20|sucDri20@0|cond|-46|20
 Awire|net@968|||2700|nor2n@0|out|-60|30|inv@9|in|-60|35
@@ -845,14 +832,14 @@ Awire|net@1017|||2700|pin@486||-11.5|35|pin@305||-11.5|37
 Awire|net@1018|||1800|inv@16|in|-16|35|pin@486||-11.5|35
 Awire|net@1026|||2700|pin@479||-14|41|pin@491||-14|69.5
 Awire|net@1027|||900|pin@491||-14|69.5|pin@312||-14|61
-Awire|net@1028|||1800|nand2@0|ina|-15.5|69.5|pin@491||-14|69.5
-Awire|net@1029|||1800|nand2@0|inb|-15.5|71.5|pin@492||-11.5|71.5
+Awire|net@1028|||1800|nand2LT@0|ina|-15.5|69.5|pin@491||-14|69.5
+Awire|net@1029|||1800|nand2LT@0|inb|-15.5|71.5|pin@492||-11.5|71.5
 Awire|net@1037|||1800|nand2@1|inb|-52|77|pin@495||-51|77
 Awire|net@1042|||2700|pin@497||-39.5|35|pin@498||-39.5|75
 Awire|net@1043|||0|pin@498||-39.5|75|nand2@1|ina|-52|75
 Awire|net@1044|||0|nand2@1|out|-57|76|predCond@5|not_state|-60|76
 Awire|net@1046|||900|pin@499||-22.5|70.5|pin@482||-22.5|64.5
-Awire|net@1047|||0|nand2@0|out|-20.5|70.5|pin@499||-22.5|70.5
+Awire|net@1047|||0|nand2LT@0|out|-20.5|70.5|pin@499||-22.5|70.5
 Awire|net@1049|||900|pin@380||-65|72.5|pin@293||-65|50.5
 Awire|net@1050|||900|inv@9|out|-60|40|pin@501||-60|39
 Awire|net@1061|||1800|sucDri20@1|not_succ|-49.25|47|pin@505||-43|47
@@ -891,12 +878,7 @@ Awire|net@1176|||900|pin@546||-81.5|26|pin@552||-81.5|25
 Awire|net@1185|||1800|pin@555||-70|21|pin@531||-59|21
 Awire|net@1186|||900|inv@22|in|-70|26|pin@555||-70|21
 Awire|net@1190|||2700|pin@556||-81.5|23|pin@552||-81.5|25
-Awire|net@1196|||1800|inv@26|out|-74.5|14|inv@24|in|-72.5|14
 Awire|net@1198|||900|pin@556||-81.5|23|pin@560||-81.5|14
-Awire|net@1199|||1800|pin@560||-81.5|14|inv@26|in|-79.5|14
-Awire|net@1200|||0|pin@537||-44|14|inv@24|out|-67.5|14
-Awire|net@1203|||0|pin@496||-51|50.5|pin@545||-81.5|50.5
-Awire|net@1205|||0|pin@542||-61|23|pin@563||-76.5|23
 Awire|net@1206|||0|pin@563||-76.5|23|pin@556||-81.5|23
 Awire|net@1207|||2700|pin@563||-76.5|23|pin@564||-76.5|63.5
 Awire|net@1208|||1800|pin@564||-76.5|63.5|pin@565||-54.5|63.5
@@ -908,7 +890,6 @@ Awire|net@1214|||900|pin@505||-43|47|pin@568||-43|43
 Awire|net@1215|||900|pin@568||-43|43|pin@478||-43|37
 Awire|net@1216|||1800|pin@567||-81.5|43|pin@568||-43|43
 Awire|net@1220|||2700|pin@296||-53|21|pin@351||-53|39
-Awire|net@1222|||900|inv@23|in|-70|44|pin@571||-70|35
 Awire|net@1223|||900|pin@571||-70|35|inv@22|out|-70|31
 Awire|net@1224|||0|pin@497||-39.5|35|pin@571||-70|35
 Awire|net@1226|||0|fire@0|NotMSN[ZeroOrDone]|-39|35|pin@497||-39.5|35
@@ -929,6 +910,13 @@ Awire|net@1249|||900|pin@579||-73.5|60|pin@580||-73.5|21
 Awire|net@1250|||1800|pin@576||-50.5|69|pin@581||-45.5|69
 Awire|net@1251|||0|pin@575||-26.5|69|pin@582||-33.5|69
 Awire|net@1252|||0|pin@582||-33.5|69|pin@581||-45.5|69
+Awire|net@1254|||1800|pin@560||-81.5|14|pin@584||-79.5|14
+Awire|net@1259|||0|pin@542||-61|23|pin@585||-75|23
+Awire|net@1263|||0|pin@496||-51|50.5|pin@545||-81.5|50.5
+Awire|net@1264|||0|pin@585||-75|23|pin@563||-76.5|23
+Awire|net@1265|||0|inv@31|in|-77|14|pin@584||-79.5|14
+Awire|net@1266|||0|inv@32|in|-69.5|14|inv@31|out|-72|14
+Awire|net@1267|||1800|inv@32|out|-64.5|14|pin@537||-44|14
 Awire|not_load_zero|D5G2;X-3.5;||0|pms1@0|g|-12.5|80|pin@368||-20|80
 Awire|not_load_zero|D5G2;X7;||1800|pms1@1|g|-6.5|30|pin@370||2|30
 Esucc[OneOrTwo]|LSN[ZeroOrDone]|D5G2;X12.5;|conn@0|a|B
@@ -937,7 +925,6 @@ Epred[OneOrTwo]|MSN[ZeroOrDone]|D5G2;X13;|conn@1|a|B
 Epred[TwoOrEmpty]|MSN[ZeroOrTwo]|D5G2;X-10.5;|conn@2|a|B
 Edisable||D5G2;X-5;|conn@7|a|I
 Enot_load_one|load_one|D5G2;X-5.5;|conn@5|a|I
-Enot_disable||D5G2;X-7;|conn@6|a|I
 Eload_one|not_load_zero|D5G2;X-8;|conn@4|a|I
 X
 
@@ -991,7 +978,7 @@ Estate[1]|state|D5G2;X2.5;|pin@6||B
 X
 
 # Cell predCondMSC;1{sch}
-CpredCondMSC;1{sch}||schematic|1227920907034|1247808339678||ATTR_X(D5G4;HNPX-23;Y28;)S@X
+CpredCondMSC;1{sch}||schematic|1227920907034|1247816700314||ATTR_X(D5G4;HNPX-23;Y28;)S@X
 IredFive:PMOS;1{ic}|PMOS@0||-7.5|7.5|||D5G4;|ATTR_Delay(D5G1;NPX-2.5;Y-1.5;)I100|ATTR_X(D5G1.5;NPX-2.5;Y1.5;)S2
 IredFive:PMOS;1{ic}|PMOS@1||-5.5|7.5|X||D5G4;|ATTR_Delay(D5G1;NPX-4.5;Y1.5;)I100|ATTR_X(D5G1.5;NPX-3.5;Y-1.5;)S2
 Ngeneric:Facet-Center|art@0||0|0||||AV
@@ -1015,7 +1002,7 @@ NWire_Pin|pin@64||-1|7.5||||
 NWire_Pin|pin@74||-6.5|10||||
 NWire_Pin|pin@76||-6.5|-4||||
 NWire_Pin|pin@77||-11|-6||||
-IredFive:pms1;2{ic}|pms1@1||-6.5|12|X||D5G4;|ATTR_Delay(D5G1;NPX-2;Y-1.5;)I100|ATTR_X(D5FLeave alone;G1.5;NOLPX3.25;Y1;)S1
+IredFive:pms1;2{ic}|pms1@1||-6.5|12|X||D5G4;|ATTR_Delay(D5G1;NPX-2;Y-1.5;)I100|ATTR_X(D5FLeave alone;G1.5;NOLPX4.25;Y3;)S2
 IpredCondMSC;1{ic}|pred10wM@1||28.5|25|||D5G4;
 Awire|net@90|||0|pin@41||34|0.5|pin@36||-6.5|0.5
 Awire|net@92|||0|conn@2|y|40.75|0.5|pin@38||21.5|0.5
-- 
1.7.10.4