Corrected several rules in the magic techfile:  (1) The "Tap not
contacted" error did not consider that varactor diffusion is
continuous across the whole varactor, so that the varactor gate
area should be considered as part of the tap area for this rule.
(2) The N-diffusion to P-tap distance (latchup rule) should not
include the varactor as part of the diffusion checked for this
rule.

sky130/magic/sky130.tech

diff --git a/sky130/magic/sky130.tech b/sky130/magic/sky130.tech
index 9a66a66..678af96 100644
--- a/sky130/magic/sky130.tech
+++ b/sky130/magic/sky130.tech
@@ -1666,10 +1666,10 @@
  and-not nwell_with_tap
 
  templayer tap_with_licon
- bloat-all psc,mvpsc psd,mvpsd
- bloat-all nsc,mvnsc nsd,mvnsd
+ bloat-all allpactivetap psd,mvpsd
+ bloat-all allnactivetap nsd,mvnsd
 
- templayer tap_missing_licon psd,nsd,mvpsd,mvnsd
+ templayer tap_missing_licon allnactivetap,allpactivetap
  and-not tap_with_licon
 
  # Make sure varactor nwell contains no P diffusion