RKM for C: Revert reading f, it is again femto

Examples files include expected results

examples/various/RKM-C-1.cir

@@ -2,16 +2,18 @@ RKM Capacitors
 
 V1 2 0 1
 R1 2 1 4K7
-C1 1 0 4p7
-C2 1 0 4n7
-C3 1 0 4u7
-C4 1 0 4m7
-C5 1 0 4F7
-C6 1 0 47p3
-C7 1 0 470p
-C8 1 0 4µ76 tc1=1e-6 tc2=1e-9 dtemp=6
-C9 1 0 4m7
-C10 1 0 470nF
+C1 1 0 4p7   ; 4.7p
+C2 1 0 4n7   ; 4.7n
+C3 1 0 4u7   ; 4.7u
+C4 1 0 4m7   ; 4.7m
+C5 1 0 4F7   ; 4.7f  <-- This deviates fom the RKM notation
+C6 1 0 47p3  ; 4.73p
+C7 1 0 470p  ; 470p
+C8 1 0 4u76 tc1=1e-6 tc2=1e-9 dtemp=6
+*            ; 4.76u
+C9 1 0 4m7   ; 4.7m
+C10 1 0 470nF ; 470n
+C11 1 0 47fF ; 47f  <-- This deviates fom the RKM notation
 
 .control
 show c

examples/various/RKM-R-1.cir

@@ -1,17 +1,18 @@
 RKM Resistors
 
 V1 1 0 1
-R1 1 0 4K7
-R2 1 0 4R7
-R3 1 0 R47
-R4 1 0 470R
-R5 1 0 47K
-R6 1 0 47K3
-R7 1 0 470K
+R1 1 0 4K7   ; 4.7k
+R2 1 0 4R7   ; 4.7
+R3 1 0 R47   ; 0.47
+R4 1 0 470R  ; 470
+R5 1 0 47K   ; 47k
+R6 1 0 47K3  ; 47.3k
+R7 1 0 470K  ; 470k
 R8 1 0 4Meg7  tc1=1e-6 tc2=1e-9 dtemp=6
-R9 1 0 4L7
-R10 1 0 470L
-R11 1 0 4M7
+*            ; 4.7Meg  <-- Not defined in the RKM notation
+R9 1 0 4L7   ; 4.7m
+R10 1 0 470L ; 470m
+R11 1 0 4M7  ; 4.7m  <-- This deviates fom the RKM notation
 
 .control
 show r

src/spicelib/parser/inpeval.c

@@ -593,8 +593,7 @@ INPevaluateRKM_C(char** line, int* error, int gobble)
         break;
     case 'r':
     case 'R':
-    case 'f':
-    case 'F': /* no femto when compat LT */
+
         expo1 = expo1;
         hasmulti = TRUE;
         break;
@@ -608,6 +607,11 @@ INPevaluateRKM_C(char** line, int* error, int gobble)
         expo1 = expo1 - 12;
         hasmulti = TRUE;
         break;
+    case 'f':
+    case 'F':
+        expo1 = expo1 - 15;
+        hasmulti = TRUE;
+        break;
     case 'm':
     case 'M':
         if (((here[1] == 'E') || (here[1] == 'e')) &&