5 files changed, 69 insertions, 47 deletions
diff --git a/library/SubcircuitLibrary/74157/3_and.pro b/library/SubcircuitLibrary/74157/3_and.pro
index 2c9ac554..9c67c7ed 100644
--- a/library/SubcircuitLibrary/74157/3_and.pro
+++ b/library/SubcircuitLibrary/74157/3_and.pro
@@ -1,4 +1,4 @@
-update=03/26/19 18:40:23
+update=Wed Mar 18 20:12:00 2020
 version=1
 last_client=eeschema
 [general]
@@ -52,7 +52,6 @@ LibName18=eSim_Hybrid
 LibName19=eSim_Miscellaneous
 LibName20=eSim_Plot
 LibName21=eSim_Power
-LibName22=eSim_PSpice
-LibName23=eSim_Sources
-LibName24=eSim_Subckt
-LibName25=eSim_User
+LibName22=eSim_Sources
+LibName23=eSim_Subckt
+LibName24=eSim_User
diff --git a/library/SubcircuitLibrary/74157/74157-cache.lib b/library/SubcircuitLibrary/74157/74157-cache.lib
index de171255..d72d1628 100644
--- a/library/SubcircuitLibrary/74157/74157-cache.lib
+++ b/library/SubcircuitLibrary/74157/74157-cache.lib
@@ -1,17 +1,17 @@
 EESchema-LIBRARY Version 2.3
 #encoding utf-8
 #
-# 3_and
+# 3_and-RESCUE-74157
 #
-DEF 3_and X 0 40 Y Y 1 F N
+DEF 3_and-RESCUE-74157 X 0 40 Y Y 1 F N
 F0 "X" 900 300 60 H V C CNN
-F1 "3_and" 950 500 60 H V C CNN
+F1 "3_and-RESCUE-74157" 950 500 60 H V C CNN
 F2 "" 0 0 60 H V C CNN
 F3 "" 0 0 60 H V C CNN
 DRAW
 A 950 400 158 716 -716 0 1 0 N 1000 550 1000 250
-P 2 0 1 0  650 550  1000 550 N
-P 3 0 1 0  650 550  650 250  1000 250 N
+P 2 0 1 0 650 550 1000 550 N
+P 3 0 1 0 650 550 650 250 1000 250 N
 X in1 1 450 500 200 R 50 50 1 1 I
 X in2 2 450 400 200 R 50 50 1 1 I
 X in3 3 450 300 200 R 50 50 1 1 I
@@ -67,7 +67,7 @@ F1 "d_inverter" 0 150 60 H V C CNN
 F2 "" 50 -50 60 H V C CNN
 F3 "" 50 -50 60 H V C CNN
 DRAW
-P 4 0 1 0  -100 50  -100 -50  100 0  -100 50 N
+P 4 0 1 0 -100 50 -100 -50 100 0 -100 50 N
 X ~ 1 -300 0 200 R 50 50 1 1 I
 X ~ 2 300 0 200 L 50 50 1 1 O I
 ENDDRAW
@@ -84,8 +84,8 @@ DRAW
 A -450 50 224 266 -266 0 1 0 N -250 150 -250 -50
 A -25 -124 325 574 323 0 1 0 N 150 150 250 50
 A 74 125 191 -665 -231 0 1 0 N 150 -50 250 50
-P 2 0 1 0  -250 -50  150 -50 N
-P 2 0 1 0  -250 150  150 150 N
+P 2 0 1 0 -250 -50 150 -50 N
+P 2 0 1 0 -250 150 150 150 N
 X IN1 1 -450 100 215 R 50 50 1 1 I
 X IN2 2 -450 0 215 R 50 50 1 1 I
 X OUT 3 450 50 200 L 50 50 1 1 O
diff --git a/library/SubcircuitLibrary/74157/74157-rescue.lib b/library/SubcircuitLibrary/74157/74157-rescue.lib
new file mode 100644
index 00000000..cac27fc1
--- /dev/null
+++ b/library/SubcircuitLibrary/74157/74157-rescue.lib
@@ -0,0 +1,22 @@
+EESchema-LIBRARY Version 2.3
+#encoding utf-8
+#
+# 3_and-RESCUE-74157
+#
+DEF 3_and-RESCUE-74157 X 0 40 Y Y 1 F N
+F0 "X" 900 300 60 H V C CNN
+F1 "3_and-RESCUE-74157" 950 500 60 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+A 950 400 158 716 -716 0 1 0 N 1000 550 1000 250
+P 2 0 1 0 650 550 1000 550 N
+P 3 0 1 0 650 550 650 250 1000 250 N
+X in1 1 450 500 200 R 50 50 1 1 I
+X in2 2 450 400 200 R 50 50 1 1 I
+X in3 3 450 300 200 R 50 50 1 1 I
+X out 4 1300 400 200 L 50 50 1 1 O
+ENDDRAW
+ENDDEF
+#
+#End Library
diff --git a/library/SubcircuitLibrary/74157/74157.pro b/library/SubcircuitLibrary/74157/74157.pro
index c18140ca..70c266b8 100644
--- a/library/SubcircuitLibrary/74157/74157.pro
+++ b/library/SubcircuitLibrary/74157/74157.pro
@@ -1,4 +1,4 @@
-update=03/28/19 22:30:06
+update=Wed Mar 18 20:12:25 2020
 version=1
 last_client=eeschema
 [general]
@@ -31,26 +31,27 @@ NetIExt=net
 version=1
 LibDir=
 [eeschema/libraries]
-LibName1=power
-LibName2=intel
-LibName3=audio
-LibName4=interface
-LibName5=digital-audio
-LibName6=philips
-LibName7=display
-LibName8=cypress
-LibName9=siliconi
-LibName10=opto
-LibName11=atmel
-LibName12=contrib
-LibName13=valves
-LibName14=eSim_Analog
-LibName15=eSim_Devices
-LibName16=eSim_Digital
-LibName17=eSim_Hybrid
-LibName18=eSim_Miscellaneous
-LibName19=eSim_Plot
-LibName20=eSim_Power
-LibName21=eSim_Subckt
-LibName22=eSim_Sources
-LibName23=eSim_User
+LibName1=74157-rescue
+LibName2=power
+LibName3=intel
+LibName4=audio
+LibName5=interface
+LibName6=digital-audio
+LibName7=philips
+LibName8=display
+LibName9=cypress
+LibName10=siliconi
+LibName11=opto
+LibName12=atmel
+LibName13=contrib
+LibName14=valves
+LibName15=eSim_Analog
+LibName16=eSim_Devices
+LibName17=eSim_Digital
+LibName18=eSim_Hybrid
+LibName19=eSim_Miscellaneous
+LibName20=eSim_Plot
+LibName21=eSim_Power
+LibName22=eSim_Subckt
+LibName23=eSim_Sources
+LibName24=eSim_User
diff --git a/library/SubcircuitLibrary/74157/74157.sch b/library/SubcircuitLibrary/74157/74157.sch
index 7fd3609e..fc95564d 100644
--- a/library/SubcircuitLibrary/74157/74157.sch
+++ b/library/SubcircuitLibrary/74157/74157.sch
@@ -1,4 +1,5 @@
 EESchema Schematic File Version 2
+LIBS:74157-rescue
 LIBS:power
 LIBS:intel
 LIBS:audio
@@ -19,10 +20,9 @@ LIBS:eSim_Hybrid
 LIBS:eSim_Miscellaneous
 LIBS:eSim_Plot
 LIBS:eSim_Power
-LIBS:eSim_PSpice
+LIBS:eSim_Subckt
 LIBS:eSim_Sources
 LIBS:eSim_User
-LIBS:eSim_Subckt
 LIBS:74157-cache
 EELAYER 25 0
 EELAYER END
@@ -439,7 +439,7 @@ Wire Wire Line
 	3400 6650 3400 5700
 Connection ~ 3450 5700
 $Comp
-L 3_and X2
+L 3_and-RESCUE-74157 X2
 U 1 1 5C9D0110
 P 3450 2400
 F 0 "X2" H 4350 2700 60  0000 C CNN
@@ -450,7 +450,7 @@ F 3 "" H 3450 2400 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L 3_and X3
+L 3_and-RESCUE-74157 X3
 U 1 1 5C9D01B8
 P 3450 2900
 F 0 "X3" H 4350 3200 60  0000 C CNN
@@ -461,7 +461,7 @@ F 3 "" H 3450 2900 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L 3_and X4
+L 3_and-RESCUE-74157 X4
 U 1 1 5C9D0222
 P 3450 3350
 F 0 "X4" H 4350 3650 60  0000 C CNN
@@ -472,7 +472,7 @@ F 3 "" H 3450 3350 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L 3_and X5
+L 3_and-RESCUE-74157 X5
 U 1 1 5C9D0289
 P 3450 3850
 F 0 "X5" H 4350 4150 60  0000 C CNN
@@ -483,7 +483,7 @@ F 3 "" H 3450 3850 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L 3_and X6
+L 3_and-RESCUE-74157 X6
 U 1 1 5C9D0361
 P 3450 4650
 F 0 "X6" H 4350 4950 60  0000 C CNN
@@ -494,7 +494,7 @@ F 3 "" H 3450 4650 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L 3_and X7
+L 3_and-RESCUE-74157 X7
 U 1 1 5C9D0367
 P 3450 5150
 F 0 "X7" H 4350 5450 60  0000 C CNN
@@ -505,7 +505,7 @@ F 3 "" H 3450 5150 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L 3_and X1
+L 3_and-RESCUE-74157 X1
 U 1 1 5C9D036D
 P 3400 5600
 F 0 "X1" H 4300 5900 60  0000 C CNN
@@ -516,7 +516,7 @@ F 3 "" H 3400 5600 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L 3_and X8
+L 3_and-RESCUE-74157 X8
 U 1 1 5C9D0373
 P 3450 6100
 F 0 "X8" H 4350 6400 60  0000 C CNN