Imported Upstream version 6.1.20120620

11 files changed, 3588 insertions, 250 deletions

diff --git a/object/objalign.c b/object/objalign.c
index 4eb39ab3..77700030 100644
--- a/object/objalign.c
+++ b/object/objalign.c
@@ -29,7 +29,7 @@
 *   
 * Version Creation Date: 4/1/91
 *
-* $Revision: 6.18 $
+* $Revision: 6.19 $
 *
 * File Description:  Object manager for module NCBI-Seqalign
 *
@@ -393,6 +393,8 @@ NLM_EXTERN Boolean LIBCALL SeqAlignAsnWrite (SeqAlignPtr sap, AsnIoPtr aip, AsnT
     Boolean retval = FALSE;
     ValNodePtr anp;
     UserObjectPtr uop;
+    Boolean asn_no_newline;
+    Int2 linelength;
 
 	if (! loaded)
 	{
@@ -414,6 +416,11 @@ NLM_EXTERN Boolean LIBCALL SeqAlignAsnWrite (SeqAlignPtr sap, AsnIoPtr aip, AsnT
     if (atp == NULL)
         return FALSE;
 
+    asn_no_newline = aip->asn_no_newline;
+    aip->asn_no_newline = TRUE;
+    linelength = aip->linelength;
+    aip->linelength = 500;
+
 	if (sap == NULL) { AsnNullValueMsg(aip, atp); goto erret; }
 
     if (! AsnOpenStruct(aip, atp, (Pointer)sap))
@@ -545,6 +552,8 @@ NLM_EXTERN Boolean LIBCALL SeqAlignAsnWrite (SeqAlignPtr sap, AsnIoPtr aip, AsnT
     retval = TRUE;
 erret:
 	AsnUnlinkType(orig);       /* unlink local tree */
+    aip->asn_no_newline = asn_no_newline;
+    aip->linelength = linelength;
 	return retval;
 }
 
diff --git a/object/objfdef.c b/object/objfdef.c
index f182f48e..043bd8ca 100644
--- a/object/objfdef.c
+++ b/object/objfdef.c
@@ -29,7 +29,7 @@
 *   
 * Version Creation Date: 9/94
 *
-* $Revision: 6.46 $
+* $Revision: 6.49 $
 *
 * File Description:  Object manager for feature definitions
 *
@@ -702,7 +702,10 @@ static CharPtr featDefSetMemStr = "FeatDefGroupSet ::= {\n" \
 "{ typelabel \"tmRNA\" , menulabel \"Transfer-messenger RNA\" , featdef-key 95 , seqfeat-key 5 , entrygroup 3 , displaygroup 3 , molgroup na } ,\n" \
 "{ typelabel \"CloneRef\" , menulabel \"Clone Reference\" , featdef-key 96 , seqfeat-key 21 , entrygroup 0 , displaygroup 0 , molgroup na } ,\n" \
 "{ typelabel \"VariationRef\" , menulabel \"Variation Reference\" , featdef-key 97 , seqfeat-key 22 , entrygroup 0 , displaygroup 0 , molgroup na } ,\n" \
-"{ typelabel \"mobile_element\" , menulabel \"Mobile genetic element\" , featdef-key 98 , seqfeat-key 8 , entrygroup 1 , displaygroup 1 , molgroup na  } } };\n";
+"{ typelabel \"mobile_element\" , menulabel \"Mobile genetic element\" , featdef-key 98 , seqfeat-key 8 , entrygroup 1 , displaygroup 1 , molgroup na } ,\n" \
+"{ typelabel \"centromere\" , menulabel \"Centromere\" , featdef-key 99 , seqfeat-key 8 , entrygroup 1 , displaygroup 1 , molgroup na } ,\n" \
+"{ typelabel \"telomere\" , menulabel \"Telomere\" , featdef-key 100 , seqfeat-key 8 , entrygroup 1 , displaygroup 1 , molgroup na } ,\n" \
+"{ typelabel \"assembly_gap\" , menulabel \"Assembly Gap\" , featdef-key 101 , seqfeat-key 8 , entrygroup 0 , displaygroup 4 , molgroup na } } };\n";
 #endif
 
 /*****************************************************************************
@@ -1281,6 +1284,19 @@ protref:    if (prp->name != NULL)
                     return (len - buflen);
                 }
             }
+            else if(! StringICmp("variation", ifp->key))
+            {
+                /* For variation, label should be a 
+                   list of replace quals */
+                for (gbp = sfp->qual; gbp != NULL; gbp = gbp->next)
+                {
+                    if (! StringICmp("replace", gbp->qual)) {
+                        diff = LabelCopy(buf, gbp->val, buflen);
+                        buflen -= diff; buf += diff;
+                    }
+                }
+                return (len - buflen);
+            }
             else if (labeltype == OM_LABEL_CONTENT) /* show key */
             {
                 if (! StringICmp("CDS", ifp->key))
diff --git a/object/objfdef.h b/object/objfdef.h
index 07f4926e..f1d7e053 100644
--- a/object/objfdef.h
+++ b/object/objfdef.h
@@ -29,7 +29,7 @@
 *   
 * Version Creation Date: 9/94
 *
-* $Revision: 6.9 $
+* $Revision: 6.11 $
 *
 * File Description:  Object manager for feature definitions
 *
@@ -316,8 +316,11 @@ NLM_EXTERN FeatDefPtr LIBCALL FeatDefFindNext PROTO((FeatDefPtr curr, Uint1Ptr k
 #define FEATDEF_CLONEREF 96
 #define FEATDEF_VARIATIONREF 97
 #define FEATDEF_mobile_element 98
+#define FEATDEF_centromere 99
+#define FEATDEF_telomere 100
+#define FEATDEF_assembly_gap 101
 
-#define FEATDEF_MAX 99 /* size of array needed for featdef filter parameters */
+#define FEATDEF_MAX 102 /* size of array needed for featdef filter parameters */
 
 
 #ifdef __cplusplus
diff --git a/object/objfeat.c b/object/objfeat.c
index 02289368..84c3e215 100644
--- a/object/objfeat.c
+++ b/object/objfeat.c
@@ -29,7 +29,7 @@
 *   
 * Version Creation Date: 4/1/91
 *
-* $Revision: 6.70 $
+* $Revision: 6.74 $
 *
 * File Description:  Object manager for module NCBI-SeqFeat
 *
@@ -3344,7 +3344,7 @@ static CharPtr genCodeTblMemStr = "Genetic-code-table ::= {\n" \
 "sncbieaa \"--------------------------------M--M---------------M------------\" } ,\n" \
 "{ name \"Pterobranchia Mitochondrial\" , id 24 ,\n" \
 "ncbieaa  \"FFLLSSSSYY**CCWWLLLLPPPPHHQQRRRRIIIMTTTTNNKKSSSKVVVVAAAADDEEGGGG\",\n" \
-"sncbieaa \"---M---------------M---------------M----------------------------\" } };\n";
+"sncbieaa \"---M---------------M---------------M---------------M------------\" } };\n";
 #endif
 
 /*****************************************************************************
@@ -5341,11 +5341,11 @@ erret:
 
 /*****************************************************************************
 *
-*   ValNodeStringMatch(vnp1, vnp2)
+*   ValNodeStringListMatch(vnp1, vnp2)
 *
 *   This function is used by OrgRefMatch.
 *****************************************************************************/
-static Boolean ValNodeStringMatch (ValNodePtr vnp1, ValNodePtr vnp2)
+NLM_EXTERN Boolean ValNodeStringListMatch (ValNodePtr vnp1, ValNodePtr vnp2)
 {
   if (vnp1 == NULL && vnp2 == NULL)
   {
@@ -5365,7 +5365,7 @@ static Boolean ValNodeStringMatch (ValNodePtr vnp1, ValNodePtr vnp2)
   }
   else
   {
-    return ValNodeStringMatch (vnp1->next, vnp2->next);
+    return ValNodeStringListMatch (vnp1->next, vnp2->next);
   }
 }
 
@@ -5376,7 +5376,7 @@ static Boolean ValNodeStringMatch (ValNodePtr vnp1, ValNodePtr vnp2)
 *
 *   This function is used by OrgRefMatch.
 *****************************************************************************/
-static Boolean ValNodeDbtagMatch (ValNodePtr vnp1, ValNodePtr vnp2)
+NLM_EXTERN Boolean ValNodeDbtagMatch (ValNodePtr vnp1, ValNodePtr vnp2)
 {
   if (vnp1 == NULL && vnp2 == NULL)
   {
@@ -5420,7 +5420,7 @@ NLM_EXTERN Boolean LIBCALL OrgRefMatch (OrgRefPtr orp1, OrgRefPtr orp2)
   {
     return FALSE;
   }
-  else if (!ValNodeStringMatch (orp1->syn, orp2->syn)
+  else if (!ValNodeStringListMatch (orp1->syn, orp2->syn)
           || ! ValNodeDbtagMatch (orp1->db, orp2->db))
   {
     return FALSE;
@@ -9112,6 +9112,14 @@ CloneSeqAsnRead(AsnIoPtr aip, AsnTypePtr orig)
       }
       atp = AsnReadId(aip,amp, atp);
    }
+   if (atp == CLONE_SEQ_support) {
+      if ( AsnReadVal(aip, atp, &av) <= 0) {
+         goto erret;
+      }
+      ptr -> support = av.intvalue;
+      ptr -> OBbits__ |= 1<<1;
+      atp = AsnReadId(aip,amp, atp);
+   }
 
    if (AsnReadVal(aip, atp, &av) <= 0) {
       goto erret;
@@ -9183,6 +9191,9 @@ CloneSeqAsnWrite(CloneSeqPtr ptr, AsnIoPtr aip, AsnTypePtr orig)
          goto erret;
       }
    }
+   if (ptr -> support || (ptr -> OBbits__ & (1<<1) )){   av.intvalue = ptr -> support;
+      retval = AsnWrite(aip, CLONE_SEQ_support,  &av);
+   }
    if (! AsnCloseStruct(aip, atp, (Pointer)ptr)) {
       goto erret;
    }
diff --git a/object/objfeat.h b/object/objfeat.h
index 5c093703..17bbdc35 100644
--- a/object/objfeat.h
+++ b/object/objfeat.h
@@ -29,7 +29,7 @@
 *   
 * Version Creation Date: 4/1/91
 *
-* $Revision: 6.39 $
+* $Revision: 6.42 $
 *
 * File Description:  Object manager interface for module NCBI-SeqFeat
 *
@@ -747,6 +747,8 @@ NLM_EXTERN Boolean   LIBCALL OrgRefAsnWrite PROTO((OrgRefPtr orp, AsnIoPtr aip,
 NLM_EXTERN OrgRefPtr LIBCALL OrgRefAsnRead PROTO((AsnIoPtr aip, AsnTypePtr atp));
 NLM_EXTERN OrgRefPtr LIBCALL OrgRefFree PROTO((OrgRefPtr orp));
 NLM_EXTERN Boolean LIBCALL OrgRefMatch (OrgRefPtr orp1, OrgRefPtr orp2);
+NLM_EXTERN Boolean ValNodeDbtagMatch (ValNodePtr vnp1, ValNodePtr vnp2);
+NLM_EXTERN Boolean ValNodeStringListMatch (ValNodePtr vnp1, ValNodePtr vnp2);
 
 /*****************************************************************************
 *
@@ -936,6 +938,9 @@ typedef struct clone_seq {
    ValNodePtr  location;
    ValNodePtr  seq;
    DbtagPtr    align_id;
+#define OB__Clone_seq_support 1
+
+   Int4   support;
 } CloneSeq, PNTR CloneSeqPtr;
 
 
diff --git a/object/objmacro.c b/object/objmacro.c
index 0a4d5439..3c01676c 100755
--- a/object/objmacro.c
+++ b/object/objmacro.c
@@ -31,7 +31,7 @@ objmacroAsnLoad(void)
 
 /**************************************************
 *    Generated object loaders for Module NCBI-Macro
-*    Generated using ASNCODE Revision: 6.17 at Jul 12, 2011 12:37 PM
+*    Generated using ASNCODE Revision: 6.19 at Jun 6, 2012 10:06 AM
 *
 **************************************************/
 
@@ -765,7 +765,7 @@ WordSubstitutionAsnRead(AsnIoPtr aip, AsnTypePtr orig)
       }
       atp = AsnReadId(aip,amp, atp);
    }
-   if (atp == SUBSTITUTION_case_sensitive) {
+   if (atp == WORD_SUBSTITUTION_case_sensitive) {
       if ( AsnReadVal(aip, atp, &av) <= 0) {
          goto erret;
       }
@@ -836,7 +836,7 @@ WordSubstitutionAsnWrite(WordSubstitutionPtr ptr, AsnIoPtr aip, AsnTypePtr orig)
    }
    retval = AsnGenericBaseSeqOfAsnWrite(ptr -> synonyms ,ASNCODE_PTRVAL_SLOT, aip, WORD_SUBSTITUTION_synonyms, WORD_SUBSTITUTION_synonyms_E);
    av.boolvalue = ptr -> case_sensitive;
-   retval = AsnWrite(aip, SUBSTITUTION_case_sensitive,  &av);
+   retval = AsnWrite(aip, WORD_SUBSTITUTION_case_sensitive,  &av);
    av.boolvalue = ptr -> whole_word;
    retval = AsnWrite(aip, WORD_SUBSTITUTION_whole_word,  &av);
    if (! AsnCloseStruct(aip, atp, (Pointer)ptr)) {
@@ -1064,14 +1064,14 @@ StringConstraintAsnRead(AsnIoPtr aip, AsnTypePtr orig)
       ptr -> match_text = av.ptrvalue;
       atp = AsnReadId(aip,amp, atp);
    }
-   if (atp == CONSTRAINT_match_location) {
+   if (atp == STRING_CONSTRAINT_match_location) {
       if ( AsnReadVal(aip, atp, &av) <= 0) {
          goto erret;
       }
       ptr -> match_location = av.intvalue;
       atp = AsnReadId(aip,amp, atp);
    }
-   if (atp == CONSTRAINT_case_sensitive) {
+   if (atp == STRING_CONSTRAINT_case_sensitive) {
       if ( AsnReadVal(aip, atp, &av) <= 0) {
          goto erret;
       }
@@ -1197,9 +1197,9 @@ StringConstraintAsnWrite(StringConstraintPtr ptr, AsnIoPtr aip, AsnTypePtr orig)
       retval = AsnWrite(aip, STRING_CONSTRAINT_match_text,  &av);
    }
    av.intvalue = ptr -> match_location;
-   retval = AsnWrite(aip, CONSTRAINT_match_location,  &av);
+   retval = AsnWrite(aip, STRING_CONSTRAINT_match_location,  &av);
    av.boolvalue = ptr -> case_sensitive;
-   retval = AsnWrite(aip, CONSTRAINT_case_sensitive,  &av);
+   retval = AsnWrite(aip, STRING_CONSTRAINT_case_sensitive,  &av);
    av.boolvalue = ptr -> ignore_space;
    retval = AsnWrite(aip, STRING_CONSTRAINT_ignore_space,  &av);
    av.boolvalue = ptr -> ignore_punct;
@@ -1423,21 +1423,21 @@ LocationPosConstraintAsnRead(AsnIoPtr aip, AsnTypePtr orig)
    if (atp == NULL) {
       goto erret;
    }
-   if (atp == POS_CONSTRAINT_dist_from_end) {
+   if (atp == LOCATION_POS_CONSTRAINT_dist_from_end) {
       choice = LocationPosConstraint_dist_from_end;
       if (AsnReadVal(aip, atp, &av) <= 0) {
          goto erret;
       }
       anp->data.intvalue = av.intvalue;
    }
-   else if (atp == CONSTRAINT_max_dist_from_end) {
+   else if (atp == LOCATION_POS_CONSTRAINT_max_dist_from_end) {
       choice = LocationPosConstraint_max_dist_from_end;
       if (AsnReadVal(aip, atp, &av) <= 0) {
          goto erret;
       }
       anp->data.intvalue = av.intvalue;
    }
-   else if (atp == CONSTRAINT_min_dist_from_end) {
+   else if (atp == LOCATION_POS_CONSTRAINT_min_dist_from_end) {
       choice = LocationPosConstraint_min_dist_from_end;
       if (AsnReadVal(aip, atp, &av) <= 0) {
          goto erret;
@@ -1507,15 +1507,15 @@ LocationPosConstraintAsnWrite(LocationPosConstraintPtr anp, AsnIoPtr aip, AsnTyp
    {
    case LocationPosConstraint_dist_from_end:
       av.intvalue = anp->data.intvalue;
-      retval = AsnWrite(aip, POS_CONSTRAINT_dist_from_end, &av);
+      retval = AsnWrite(aip, LOCATION_POS_CONSTRAINT_dist_from_end, &av);
       break;
    case LocationPosConstraint_max_dist_from_end:
       av.intvalue = anp->data.intvalue;
-      retval = AsnWrite(aip, CONSTRAINT_max_dist_from_end, &av);
+      retval = AsnWrite(aip, LOCATION_POS_CONSTRAINT_max_dist_from_end, &av);
       break;
    case LocationPosConstraint_min_dist_from_end:
       av.intvalue = anp->data.intvalue;
-      retval = AsnWrite(aip, CONSTRAINT_min_dist_from_end, &av);
+      retval = AsnWrite(aip, LOCATION_POS_CONSTRAINT_min_dist_from_end, &av);
       break;
    }
    if (writetype != NULL) {
@@ -1647,7 +1647,7 @@ LocationConstraintAsnRead(AsnIoPtr aip, AsnTypePtr orig)
       ptr -> partial3 = av.intvalue;
       atp = AsnReadId(aip,amp, atp);
    }
-   if (atp == CONSTRAINT_location_type) {
+   if (atp == LOCATION_CONSTRAINT_location_type) {
       if ( AsnReadVal(aip, atp, &av) <= 0) {
          goto erret;
       }
@@ -1728,7 +1728,7 @@ LocationConstraintAsnWrite(LocationConstraintPtr ptr, AsnIoPtr aip, AsnTypePtr o
    av.intvalue = ptr -> partial3;
    retval = AsnWrite(aip, LOCATION_CONSTRAINT_partial3,  &av);
    av.intvalue = ptr -> location_type;
-   retval = AsnWrite(aip, CONSTRAINT_location_type,  &av);
+   retval = AsnWrite(aip, LOCATION_CONSTRAINT_location_type,  &av);
    if (ptr -> end5 != NULL) {
       if ( ! LocationPosConstraintAsnWrite(ptr -> end5, aip, LOCATION_CONSTRAINT_end5)) {
          goto erret;
@@ -4385,7 +4385,7 @@ CDSGeneProtFieldPairAsnRead(AsnIoPtr aip, AsnTypePtr orig)
    atp = AsnReadId(aip,amp, atp);
    func = NULL;
 
-   if (atp == FIELD_PAIR_field_from) {
+   if (atp == CDSGENEPROT_FIELD_PAIR_field_from) {
       if ( AsnReadVal(aip, atp, &av) <= 0) {
          goto erret;
       }
@@ -4451,7 +4451,7 @@ CDSGeneProtFieldPairAsnWrite(CDSGeneProtFieldPairPtr ptr, AsnIoPtr aip, AsnTypeP
    }
 
    av.intvalue = ptr -> field_from;
-   retval = AsnWrite(aip, FIELD_PAIR_field_from,  &av);
+   retval = AsnWrite(aip, CDSGENEPROT_FIELD_PAIR_field_from,  &av);
    av.intvalue = ptr -> field_to;
    retval = AsnWrite(aip, CDSGENEPROT_FIELD_PAIR_field_to,  &av);
    if (! AsnCloseStruct(aip, atp, (Pointer)ptr)) {
@@ -5752,7 +5752,7 @@ MolinfoFieldPairAsnRead(AsnIoPtr aip, AsnTypePtr orig)
       choice = MolinfoFieldPair_technique;
       func = (AsnReadFunc) MolinfoTechniquePairAsnRead;
    }
-   else if (atp == FIELD_PAIR_completedness) {
+   else if (atp == MOLINFO_FIELD_PAIR_completedness) {
       choice = MolinfoFieldPair_completedness;
       func = (AsnReadFunc) MolinfoCompletednessPairAsnRead;
    }
@@ -5838,7 +5838,7 @@ MolinfoFieldPairAsnWrite(MolinfoFieldPairPtr anp, AsnIoPtr aip, AsnTypePtr orig)
       func = (AsnWriteFunc) MolinfoTechniquePairAsnWrite;
       break;
    case MolinfoFieldPair_completedness:
-      writetype = FIELD_PAIR_completedness;
+      writetype = MOLINFO_FIELD_PAIR_completedness;
       func = (AsnWriteFunc) MolinfoCompletednessPairAsnWrite;
       break;
    case MolinfoFieldPair_mol_class:
@@ -6227,7 +6227,7 @@ StructuredCommentFieldAsnRead(AsnIoPtr aip, AsnTypePtr orig)
    if (atp == NULL) {
       goto erret;
    }
-   if (atp == COMMENT_FIELD_database) {
+   if (atp == STRUCTURED_COMMENT_FIELD_database) {
       choice = StructuredCommentField_database;
       if (AsnReadVal(aip, atp, &av) <= 0) {
          goto erret;
@@ -6241,7 +6241,7 @@ StructuredCommentFieldAsnRead(AsnIoPtr aip, AsnTypePtr orig)
       }
       anp->data.ptrvalue = av.ptrvalue;
    }
-   else if (atp == COMMENT_FIELD_field_name) {
+   else if (atp == STRUCTURED_COMMENT_FIELD_field_name) {
       choice = StructuredCommentField_field_name;
       if (AsnReadVal(aip, atp, &av) <= 0) {
          goto erret;
@@ -6311,7 +6311,7 @@ StructuredCommentFieldAsnWrite(StructuredCommentFieldPtr anp, AsnIoPtr aip, AsnT
    {
    case StructuredCommentField_database:
       av.boolvalue = anp->data.boolvalue;
-      retval = AsnWrite(aip, COMMENT_FIELD_database, &av);
+      retval = AsnWrite(aip, STRUCTURED_COMMENT_FIELD_database, &av);
       break;
    case StructuredCommentField_named:
       av.ptrvalue = anp->data.ptrvalue;
@@ -6319,7 +6319,7 @@ StructuredCommentFieldAsnWrite(StructuredCommentFieldPtr anp, AsnIoPtr aip, AsnT
       break;
    case StructuredCommentField_field_name:
       av.boolvalue = anp->data.boolvalue;
-      retval = AsnWrite(aip, COMMENT_FIELD_field_name, &av);
+      retval = AsnWrite(aip, STRUCTURED_COMMENT_FIELD_field_name, &av);
       break;
    }
    if (writetype != NULL) {
@@ -6418,14 +6418,14 @@ StructuredCommentFieldPairAsnRead(AsnIoPtr aip, AsnTypePtr orig)
    atp = AsnReadId(aip,amp, atp);
    func = NULL;
 
-   if (atp == COMMENT_FIELD_PAIR_from) {
+   if (atp == STRUCTURED_COMMENT_FIELD_PAIR_from) {
       ptr -> from = StructuredCommentFieldAsnRead(aip, atp);
       if (aip -> io_failure) {
          goto erret;
       }
       atp = AsnReadId(aip,amp, atp);
    }
-   if (atp == COMMENT_FIELD_PAIR_to) {
+   if (atp == STRUCTURED_COMMENT_FIELD_PAIR_to) {
       ptr -> to = StructuredCommentFieldAsnRead(aip, atp);
       if (aip -> io_failure) {
          goto erret;
@@ -6484,12 +6484,12 @@ StructuredCommentFieldPairAsnWrite(StructuredCommentFieldPairPtr ptr, AsnIoPtr a
    }
 
    if (ptr -> from != NULL) {
-      if ( ! StructuredCommentFieldAsnWrite(ptr -> from, aip, COMMENT_FIELD_PAIR_from)) {
+      if ( ! StructuredCommentFieldAsnWrite(ptr -> from, aip, STRUCTURED_COMMENT_FIELD_PAIR_from)) {
          goto erret;
       }
    }
    if (ptr -> to != NULL) {
-      if ( ! StructuredCommentFieldAsnWrite(ptr -> to, aip, COMMENT_FIELD_PAIR_to)) {
+      if ( ! StructuredCommentFieldAsnWrite(ptr -> to, aip, STRUCTURED_COMMENT_FIELD_PAIR_to)) {
          goto erret;
       }
    }
@@ -6885,9 +6885,9 @@ PubFieldSpecialConstraintTypeAsnRead(AsnIoPtr aip, AsnTypePtr orig)
    }
 
    if (orig == NULL) {         /* PubFieldSpecialConstraintType ::= (self contained) */
-      atp = AsnReadId(aip, amp, FIELD_SPECIAL_CONSTRAINT_TYPE);
+      atp = AsnReadId(aip, amp, PUB_FIELD_SPECIAL_CONSTRAINT_TYPE);
    } else {
-      atp = AsnLinkType(orig, FIELD_SPECIAL_CONSTRAINT_TYPE);    /* link in local tree */
+      atp = AsnLinkType(orig, PUB_FIELD_SPECIAL_CONSTRAINT_TYPE);    /* link in local tree */
    }
    if (atp == NULL) {
       return NULL;
@@ -6907,35 +6907,35 @@ PubFieldSpecialConstraintTypeAsnRead(AsnIoPtr aip, AsnTypePtr orig)
    if (atp == NULL) {
       goto erret;
    }
-   if (atp == CONSTRAINT_TYPE_is_present) {
+   if (atp == PUB_FIELD_SPECIAL_CONSTRAINT_TYPE_is_present) {
       choice = PubFieldSpecialConstraintType_is_present;
       if (AsnReadVal(aip, atp, &av) <= 0) {
          goto erret;
       }
       anp->data.boolvalue = av.boolvalue;
    }
-   else if (atp == CONSTRAINT_TYPE_is_not_present) {
+   else if (atp == PUB_FIELD_SPECIAL_CONSTRAINT_TYPE_is_not_present) {
       choice = PubFieldSpecialConstraintType_is_not_present;
       if (AsnReadVal(aip, atp, &av) <= 0) {
          goto erret;
       }
       anp->data.boolvalue = av.boolvalue;
    }
-   else if (atp == CONSTRAINT_TYPE_is_all_caps) {
+   else if (atp == PUB_FIELD_SPECIAL_CONSTRAINT_TYPE_is_all_caps) {
       choice = PubFieldSpecialConstraintType_is_all_caps;
       if (AsnReadVal(aip, atp, &av) <= 0) {
          goto erret;
       }
       anp->data.boolvalue = av.boolvalue;
    }
-   else if (atp == CONSTRAINT_TYPE_is_all_lower) {
+   else if (atp == PUB_FIELD_SPECIAL_CONSTRAINT_TYPE_is_all_lower) {
       choice = PubFieldSpecialConstraintType_is_all_lower;
       if (AsnReadVal(aip, atp, &av) <= 0) {
          goto erret;
       }
       anp->data.boolvalue = av.boolvalue;
    }
-   else if (atp == CONSTRAINT_TYPE_is_all_punct) {
+   else if (atp == PUB_FIELD_SPECIAL_CONSTRAINT_TYPE_is_all_punct) {
       choice = PubFieldSpecialConstraintType_is_all_punct;
       if (AsnReadVal(aip, atp, &av) <= 0) {
          goto erret;
@@ -6988,7 +6988,7 @@ PubFieldSpecialConstraintTypeAsnWrite(PubFieldSpecialConstraintTypePtr anp, AsnI
    if (aip == NULL)
    return FALSE;
 
-   atp = AsnLinkType(orig, FIELD_SPECIAL_CONSTRAINT_TYPE);   /* link local tree */
+   atp = AsnLinkType(orig, PUB_FIELD_SPECIAL_CONSTRAINT_TYPE);   /* link local tree */
    if (atp == NULL) {
       return FALSE;
    }
@@ -7005,23 +7005,23 @@ PubFieldSpecialConstraintTypeAsnWrite(PubFieldSpecialConstraintTypePtr anp, AsnI
    {
    case PubFieldSpecialConstraintType_is_present:
       av.boolvalue = anp->data.boolvalue;
-      retval = AsnWrite(aip, CONSTRAINT_TYPE_is_present, &av);
+      retval = AsnWrite(aip, PUB_FIELD_SPECIAL_CONSTRAINT_TYPE_is_present, &av);
       break;
    case PubFieldSpecialConstraintType_is_not_present:
       av.boolvalue = anp->data.boolvalue;
-      retval = AsnWrite(aip, CONSTRAINT_TYPE_is_not_present, &av);
+      retval = AsnWrite(aip, PUB_FIELD_SPECIAL_CONSTRAINT_TYPE_is_not_present, &av);
       break;
    case PubFieldSpecialConstraintType_is_all_caps:
       av.boolvalue = anp->data.boolvalue;
-      retval = AsnWrite(aip, CONSTRAINT_TYPE_is_all_caps, &av);
+      retval = AsnWrite(aip, PUB_FIELD_SPECIAL_CONSTRAINT_TYPE_is_all_caps, &av);
       break;
    case PubFieldSpecialConstraintType_is_all_lower:
       av.boolvalue = anp->data.boolvalue;
-      retval = AsnWrite(aip, CONSTRAINT_TYPE_is_all_lower, &av);
+      retval = AsnWrite(aip, PUB_FIELD_SPECIAL_CONSTRAINT_TYPE_is_all_lower, &av);
       break;
    case PubFieldSpecialConstraintType_is_all_punct:
       av.boolvalue = anp->data.boolvalue;
-      retval = AsnWrite(aip, CONSTRAINT_TYPE_is_all_punct, &av);
+      retval = AsnWrite(aip, PUB_FIELD_SPECIAL_CONSTRAINT_TYPE_is_all_punct, &av);
       break;
    }
    if (writetype != NULL) {
@@ -7119,14 +7119,14 @@ PubFieldSpecialConstraintAsnRead(AsnIoPtr aip, AsnTypePtr orig)
    atp = AsnReadId(aip,amp, atp);
    func = NULL;
 
-   if (atp == FIELD_SPECIAL_CONSTRAINT_field) {
+   if (atp == PUB_FIELD_SPECIAL_CONSTRAINT_field) {
       if ( AsnReadVal(aip, atp, &av) <= 0) {
          goto erret;
       }
       ptr -> field = av.intvalue;
       atp = AsnReadId(aip,amp, atp);
    }
-   if (atp == SPECIAL_CONSTRAINT_constraint) {
+   if (atp == PUB_FIELD_SPECIAL_CONSTRAINT_constraint) {
       ptr -> constraint = PubFieldSpecialConstraintTypeAsnRead(aip, atp);
       if (aip -> io_failure) {
          goto erret;
@@ -7185,9 +7185,9 @@ PubFieldSpecialConstraintAsnWrite(PubFieldSpecialConstraintPtr ptr, AsnIoPtr aip
    }
 
    av.intvalue = ptr -> field;
-   retval = AsnWrite(aip, FIELD_SPECIAL_CONSTRAINT_field,  &av);
+   retval = AsnWrite(aip, PUB_FIELD_SPECIAL_CONSTRAINT_field,  &av);
    if (ptr -> constraint != NULL) {
-      if ( ! PubFieldSpecialConstraintTypeAsnWrite(ptr -> constraint, aip, SPECIAL_CONSTRAINT_constraint)) {
+      if ( ! PubFieldSpecialConstraintTypeAsnWrite(ptr -> constraint, aip, PUB_FIELD_SPECIAL_CONSTRAINT_constraint)) {
          goto erret;
       }
    }
@@ -7299,7 +7299,7 @@ PublicationConstraintAsnRead(AsnIoPtr aip, AsnTypePtr orig)
       }
       atp = AsnReadId(aip,amp, atp);
    }
-   if (atp == CONSTRAINT_special_field) {
+   if (atp == PUBLICATION_CONSTRAINT_special_field) {
       ptr -> special_field = PubFieldSpecialConstraintAsnRead(aip, atp);
       if (aip -> io_failure) {
          goto erret;
@@ -7365,7 +7365,7 @@ PublicationConstraintAsnWrite(PublicationConstraintPtr ptr, AsnIoPtr aip, AsnTyp
       }
    }
    if (ptr -> special_field != NULL) {
-      if ( ! PubFieldSpecialConstraintAsnWrite(ptr -> special_field, aip, CONSTRAINT_special_field)) {
+      if ( ! PubFieldSpecialConstraintAsnWrite(ptr -> special_field, aip, PUBLICATION_CONSTRAINT_special_field)) {
          goto erret;
       }
    }
@@ -7485,7 +7485,7 @@ SourceConstraintAsnRead(AsnIoPtr aip, AsnTypePtr orig)
       }
       atp = AsnReadId(aip,amp, atp);
    }
-   if (atp == CONSTRAINT_type_constraint) {
+   if (atp == SOURCE_CONSTRAINT_type_constraint) {
       if ( AsnReadVal(aip, atp, &av) <= 0) {
          goto erret;
       }
@@ -7559,7 +7559,7 @@ SourceConstraintAsnWrite(SourceConstraintPtr ptr, AsnIoPtr aip, AsnTypePtr orig)
       }
    }
    av.intvalue = ptr -> type_constraint;
-   retval = AsnWrite(aip, CONSTRAINT_type_constraint,  &av);
+   retval = AsnWrite(aip, SOURCE_CONSTRAINT_type_constraint,  &av);
    if (! AsnCloseStruct(aip, atp, (Pointer)ptr)) {
       goto erret;
    }
@@ -7653,14 +7653,14 @@ CDSGeneProtPseudoConstraintAsnRead(AsnIoPtr aip, AsnTypePtr orig)
    atp = AsnReadId(aip,amp, atp);
    func = NULL;
 
-   if (atp == PSEUDO_CONSTRAINT_feature) {
+   if (atp == CDSGENEPROT_PSEUDO_CONSTRAINT_feature) {
       if ( AsnReadVal(aip, atp, &av) <= 0) {
          goto erret;
       }
       ptr -> feature = av.intvalue;
       atp = AsnReadId(aip,amp, atp);
    }
-   if (atp == PSEUDO_CONSTRAINT_is_pseudo) {
+   if (atp == CDSGENEPROT_PSEUDO_CONSTRAINT_is_pseudo) {
       if ( AsnReadVal(aip, atp, &av) <= 0) {
          goto erret;
       }
@@ -7719,9 +7719,9 @@ CDSGeneProtPseudoConstraintAsnWrite(CDSGeneProtPseudoConstraintPtr ptr, AsnIoPtr
    }
 
    av.intvalue = ptr -> feature;
-   retval = AsnWrite(aip, PSEUDO_CONSTRAINT_feature,  &av);
+   retval = AsnWrite(aip, CDSGENEPROT_PSEUDO_CONSTRAINT_feature,  &av);
    av.boolvalue = ptr -> is_pseudo;
-   retval = AsnWrite(aip, PSEUDO_CONSTRAINT_is_pseudo,  &av);
+   retval = AsnWrite(aip, CDSGENEPROT_PSEUDO_CONSTRAINT_is_pseudo,  &av);
    if (! AsnCloseStruct(aip, atp, (Pointer)ptr)) {
       goto erret;
    }
@@ -7810,7 +7810,7 @@ CDSGeneProtConstraintFieldAsnRead(AsnIoPtr aip, AsnTypePtr orig)
    if (atp == NULL) {
       goto erret;
    }
-   if (atp == CONSTRAINT_FIELD_field) {
+   if (atp == CDSGENEPROT_CONSTRAINT_FIELD_field) {
       choice = CDSGeneProtConstraintField_field;
       if (AsnReadVal(aip, atp, &av) <= 0) {
          goto erret;
@@ -7880,7 +7880,7 @@ CDSGeneProtConstraintFieldAsnWrite(CDSGeneProtConstraintFieldPtr anp, AsnIoPtr a
    {
    case CDSGeneProtConstraintField_field:
       av.intvalue = anp->data.intvalue;
-      retval = AsnWrite(aip, CONSTRAINT_FIELD_field, &av);
+      retval = AsnWrite(aip, CDSGENEPROT_CONSTRAINT_FIELD_field, &av);
       break;
    }
    if (writetype != NULL) {
@@ -7980,21 +7980,21 @@ CDSGeneProtQualConstraintAsnRead(AsnIoPtr aip, AsnTypePtr orig)
    atp = AsnReadId(aip,amp, atp);
    func = NULL;
 
-   if (atp == QUAL_CONSTRAINT_field1) {
+   if (atp == CDSGENEPROT_QUAL_CONSTRAINT_field1) {
       ptr -> field1 = CDSGeneProtConstraintFieldAsnRead(aip, atp);
       if (aip -> io_failure) {
          goto erret;
       }
       atp = AsnReadId(aip,amp, atp);
    }
-   if (atp == QUAL_CONSTRAINT_field2) {
+   if (atp == CDSGENEPROT_QUAL_CONSTRAINT_field2) {
       ptr -> field2 = CDSGeneProtConstraintFieldAsnRead(aip, atp);
       if (aip -> io_failure) {
          goto erret;
       }
       atp = AsnReadId(aip,amp, atp);
    }
-   if (atp == QUAL_CONSTRAINT_constraint) {
+   if (atp == CDSGENEPROT_QUAL_CONSTRAINT_constraint) {
       ptr -> constraint = StringConstraintAsnRead(aip, atp);
       if (aip -> io_failure) {
          goto erret;
@@ -8053,17 +8053,17 @@ CDSGeneProtQualConstraintAsnWrite(CDSGeneProtQualConstraintPtr ptr, AsnIoPtr aip
    }
 
    if (ptr -> field1 != NULL) {
-      if ( ! CDSGeneProtConstraintFieldAsnWrite(ptr -> field1, aip, QUAL_CONSTRAINT_field1)) {
+      if ( ! CDSGeneProtConstraintFieldAsnWrite(ptr -> field1, aip, CDSGENEPROT_QUAL_CONSTRAINT_field1)) {
          goto erret;
       }
    }
    if (ptr -> field2 != NULL) {
-      if ( ! CDSGeneProtConstraintFieldAsnWrite(ptr -> field2, aip, QUAL_CONSTRAINT_field2)) {
+      if ( ! CDSGeneProtConstraintFieldAsnWrite(ptr -> field2, aip, CDSGENEPROT_QUAL_CONSTRAINT_field2)) {
          goto erret;
       }
    }
    if (ptr -> constraint != NULL) {
-      if ( ! StringConstraintAsnWrite(ptr -> constraint, aip, QUAL_CONSTRAINT_constraint)) {
+      if ( ! StringConstraintAsnWrite(ptr -> constraint, aip, CDSGENEPROT_QUAL_CONSTRAINT_constraint)) {
          goto erret;
       }
    }
@@ -8168,7 +8168,7 @@ FieldConstraintAsnRead(AsnIoPtr aip, AsnTypePtr orig)
       }
       atp = AsnReadId(aip,amp, atp);
    }
-   if (atp == CONSTRAINT_string_constraint) {
+   if (atp == FIELD_CONSTRAINT_string_constraint) {
       ptr -> string_constraint = StringConstraintAsnRead(aip, atp);
       if (aip -> io_failure) {
          goto erret;
@@ -8232,7 +8232,7 @@ FieldConstraintAsnWrite(FieldConstraintPtr ptr, AsnIoPtr aip, AsnTypePtr orig)
       }
    }
    if (ptr -> string_constraint != NULL) {
-      if ( ! StringConstraintAsnWrite(ptr -> string_constraint, aip, CONSTRAINT_string_constraint)) {
+      if ( ! StringConstraintAsnWrite(ptr -> string_constraint, aip, FIELD_CONSTRAINT_string_constraint)) {
          goto erret;
       }
    }
@@ -8553,9 +8553,9 @@ SequenceConstraintMolTypeConstraintAsnRead(AsnIoPtr aip, AsnTypePtr orig)
    }
 
    if (orig == NULL) {         /* SequenceConstraintMolTypeConstraint ::= (self contained) */
-      atp = AsnReadId(aip, amp, CONSTRAINT_MOL_TYPE_CONSTRAINT);
+      atp = AsnReadId(aip, amp, SEQUENCE_CONSTRAINT_MOL_TYPE_CONSTRAINT);
    } else {
-      atp = AsnLinkType(orig, CONSTRAINT_MOL_TYPE_CONSTRAINT);    /* link in local tree */
+      atp = AsnLinkType(orig, SEQUENCE_CONSTRAINT_MOL_TYPE_CONSTRAINT);    /* link in local tree */
    }
    if (atp == NULL) {
       return NULL;
@@ -8575,35 +8575,35 @@ SequenceConstraintMolTypeConstraintAsnRead(AsnIoPtr aip, AsnTypePtr orig)
    if (atp == NULL) {
       goto erret;
    }
-   if (atp == MOL_TYPE_CONSTRAINT_any) {
+   if (atp == SEQUENCE_CONSTRAINT_MOL_TYPE_CONSTRAINT_any) {
       choice = SequenceConstraintMolTypeConstraint_any;
       if (AsnReadVal(aip, atp, &av) <= 0) {
          goto erret;
       }
       anp->data.boolvalue = av.boolvalue;
    }
-   else if (atp == MOL_TYPE_CONSTRAINT_nucleotide) {
+   else if (atp == SEQUENCE_CONSTRAINT_MOL_TYPE_CONSTRAINT_nucleotide) {
       choice = SequenceConstraintMolTypeConstraint_nucleotide;
       if (AsnReadVal(aip, atp, &av) <= 0) {
          goto erret;
       }
       anp->data.boolvalue = av.boolvalue;
    }
-   else if (atp == MOL_TYPE_CONSTRAINT_dna) {
+   else if (atp == SEQUENCE_CONSTRAINT_MOL_TYPE_CONSTRAINT_dna) {
       choice = SequenceConstraintMolTypeConstraint_dna;
       if (AsnReadVal(aip, atp, &av) <= 0) {
          goto erret;
       }
       anp->data.boolvalue = av.boolvalue;
    }
-   else if (atp == MOL_TYPE_CONSTRAINT_rna) {
+   else if (atp == SEQUENCE_CONSTRAINT_MOL_TYPE_CONSTRAINT_rna) {
       choice = SequenceConstraintMolTypeConstraint_rna;
       if (AsnReadVal(aip, atp, &av) <= 0) {
          goto erret;
       }
       anp->data.intvalue = av.intvalue;
    }
-   else if (atp == MOL_TYPE_CONSTRAINT_protein) {
+   else if (atp == SEQUENCE_CONSTRAINT_MOL_TYPE_CONSTRAINT_protein) {
       choice = SequenceConstraintMolTypeConstraint_protein;
       if (AsnReadVal(aip, atp, &av) <= 0) {
          goto erret;
@@ -8656,7 +8656,7 @@ SequenceConstraintMolTypeConstraintAsnWrite(SequenceConstraintMolTypeConstraintP
    if (aip == NULL)
    return FALSE;
 
-   atp = AsnLinkType(orig, CONSTRAINT_MOL_TYPE_CONSTRAINT);   /* link local tree */
+   atp = AsnLinkType(orig, SEQUENCE_CONSTRAINT_MOL_TYPE_CONSTRAINT);   /* link local tree */
    if (atp == NULL) {
       return FALSE;
    }
@@ -8673,23 +8673,23 @@ SequenceConstraintMolTypeConstraintAsnWrite(SequenceConstraintMolTypeConstraintP
    {
    case SequenceConstraintMolTypeConstraint_any:
       av.boolvalue = anp->data.boolvalue;
-      retval = AsnWrite(aip, MOL_TYPE_CONSTRAINT_any, &av);
+      retval = AsnWrite(aip, SEQUENCE_CONSTRAINT_MOL_TYPE_CONSTRAINT_any, &av);
       break;
    case SequenceConstraintMolTypeConstraint_nucleotide:
       av.boolvalue = anp->data.boolvalue;
-      retval = AsnWrite(aip, MOL_TYPE_CONSTRAINT_nucleotide, &av);
+      retval = AsnWrite(aip, SEQUENCE_CONSTRAINT_MOL_TYPE_CONSTRAINT_nucleotide, &av);
       break;
    case SequenceConstraintMolTypeConstraint_dna:
       av.boolvalue = anp->data.boolvalue;
-      retval = AsnWrite(aip, MOL_TYPE_CONSTRAINT_dna, &av);
+      retval = AsnWrite(aip, SEQUENCE_CONSTRAINT_MOL_TYPE_CONSTRAINT_dna, &av);
       break;
    case SequenceConstraintMolTypeConstraint_rna:
       av.intvalue = anp->data.intvalue;
-      retval = AsnWrite(aip, MOL_TYPE_CONSTRAINT_rna, &av);
+      retval = AsnWrite(aip, SEQUENCE_CONSTRAINT_MOL_TYPE_CONSTRAINT_rna, &av);
       break;
    case SequenceConstraintMolTypeConstraint_protein:
       av.boolvalue = anp->data.boolvalue;
-      retval = AsnWrite(aip, MOL_TYPE_CONSTRAINT_protein, &av);
+      retval = AsnWrite(aip, SEQUENCE_CONSTRAINT_MOL_TYPE_CONSTRAINT_protein, &av);
       break;
    }
    if (writetype != NULL) {
@@ -8789,7 +8789,7 @@ QuantityConstraintAsnRead(AsnIoPtr aip, AsnTypePtr orig)
       }
       anp->data.intvalue = av.intvalue;
    }
-   else if (atp == CONSTRAINT_greater_than) {
+   else if (atp == QUANTITY_CONSTRAINT_greater_than) {
       choice = QuantityConstraint_greater_than;
       if (AsnReadVal(aip, atp, &av) <= 0) {
          goto erret;
@@ -8870,7 +8870,7 @@ QuantityConstraintAsnWrite(QuantityConstraintPtr anp, AsnIoPtr aip, AsnTypePtr o
       break;
    case QuantityConstraint_greater_than:
       av.intvalue = anp->data.intvalue;
-      retval = AsnWrite(aip, CONSTRAINT_greater_than, &av);
+      retval = AsnWrite(aip, QUANTITY_CONSTRAINT_greater_than, &av);
       break;
    case QuantityConstraint_less_than:
       av.intvalue = anp->data.intvalue;
@@ -8923,6 +8923,7 @@ SequenceConstraintFree(SequenceConstraintPtr ptr)
    }
    SequenceConstraintMolTypeConstraintFree(ptr -> seqtype);
    StringConstraintFree(ptr -> id);
+   QuantityConstraintFree(ptr -> num_type_features);
    QuantityConstraintFree(ptr -> num_features);
    QuantityConstraintFree(ptr -> length);
    return MemFree(ptr);
@@ -8997,7 +8998,14 @@ SequenceConstraintAsnRead(AsnIoPtr aip, AsnTypePtr orig)
       ptr -> feature = av.intvalue;
       atp = AsnReadId(aip,amp, atp);
    }
-   if (atp == CONSTRAINT_num_features) {
+   if (atp == SEQUENCE_CONSTRAINT_num_type_features) {
+      ptr -> num_type_features = QuantityConstraintAsnRead(aip, atp);
+      if (aip -> io_failure) {
+         goto erret;
+      }
+      atp = AsnReadId(aip,amp, atp);
+   }
+   if (atp == SEQUENCE_CONSTRAINT_num_features) {
       ptr -> num_features = QuantityConstraintAsnRead(aip, atp);
       if (aip -> io_failure) {
          goto erret;
@@ -9011,7 +9019,7 @@ SequenceConstraintAsnRead(AsnIoPtr aip, AsnTypePtr orig)
       }
       atp = AsnReadId(aip,amp, atp);
    }
-   if (atp == CONSTRAINT_strandedness) {
+   if (atp == SEQUENCE_CONSTRAINT_strandedness) {
       if ( AsnReadVal(aip, atp, &av) <= 0) {
          goto erret;
       }
@@ -9081,8 +9089,13 @@ SequenceConstraintAsnWrite(SequenceConstraintPtr ptr, AsnIoPtr aip, AsnTypePtr o
    }
    av.intvalue = ptr -> feature;
    retval = AsnWrite(aip, SEQUENCE_CONSTRAINT_feature,  &av);
+   if (ptr -> num_type_features != NULL) {
+      if ( ! QuantityConstraintAsnWrite(ptr -> num_type_features, aip, SEQUENCE_CONSTRAINT_num_type_features)) {
+         goto erret;
+      }
+   }
    if (ptr -> num_features != NULL) {
-      if ( ! QuantityConstraintAsnWrite(ptr -> num_features, aip, CONSTRAINT_num_features)) {
+      if ( ! QuantityConstraintAsnWrite(ptr -> num_features, aip, SEQUENCE_CONSTRAINT_num_features)) {
          goto erret;
       }
    }
@@ -9092,7 +9105,7 @@ SequenceConstraintAsnWrite(SequenceConstraintPtr ptr, AsnIoPtr aip, AsnTypePtr o
       }
    }
    av.intvalue = ptr -> strandedness;
-   retval = AsnWrite(aip, CONSTRAINT_strandedness,  &av);
+   retval = AsnWrite(aip, SEQUENCE_CONSTRAINT_strandedness,  &av);
    if (! AsnCloseStruct(aip, atp, (Pointer)ptr)) {
       goto erret;
    }
@@ -9189,28 +9202,28 @@ TranslationConstraintAsnRead(AsnIoPtr aip, AsnTypePtr orig)
    atp = AsnReadId(aip,amp, atp);
    func = NULL;
 
-   if (atp == CONSTRAINT_actual_strings) {
+   if (atp == TRANSLATION_CONSTRAINT_actual_strings) {
       ptr -> actual_strings = StringConstraintSetAsnRead(aip, atp);
       if (aip -> io_failure) {
          goto erret;
       }
       atp = AsnReadId(aip,amp, atp);
    }
-   if (atp == CONSTRAINT_transl_strings) {
+   if (atp == TRANSLATION_CONSTRAINT_transl_strings) {
       ptr -> transl_strings = StringConstraintSetAsnRead(aip, atp);
       if (aip -> io_failure) {
          goto erret;
       }
       atp = AsnReadId(aip,amp, atp);
    }
-   if (atp == CONSTRAINT_internal_stops) {
+   if (atp == TRANSLATION_CONSTRAINT_internal_stops) {
       if ( AsnReadVal(aip, atp, &av) <= 0) {
          goto erret;
       }
       ptr -> internal_stops = av.intvalue;
       atp = AsnReadId(aip,amp, atp);
    }
-   if (atp == CONSTRAINT_num_mismatches) {
+   if (atp == TRANSLATION_CONSTRAINT_num_mismatches) {
       ptr -> num_mismatches = QuantityConstraintAsnRead(aip, atp);
       if (aip -> io_failure) {
          goto erret;
@@ -9269,19 +9282,19 @@ TranslationConstraintAsnWrite(TranslationConstraintPtr ptr, AsnIoPtr aip, AsnTyp
    }
 
    if (ptr -> actual_strings != NULL) {
-      if ( ! StringConstraintSetAsnWrite(ptr -> actual_strings, aip, CONSTRAINT_actual_strings)) {
+      if ( ! StringConstraintSetAsnWrite(ptr -> actual_strings, aip, TRANSLATION_CONSTRAINT_actual_strings)) {
          goto erret;
       }
    }
    if (ptr -> transl_strings != NULL) {
-      if ( ! StringConstraintSetAsnWrite(ptr -> transl_strings, aip, CONSTRAINT_transl_strings)) {
+      if ( ! StringConstraintSetAsnWrite(ptr -> transl_strings, aip, TRANSLATION_CONSTRAINT_transl_strings)) {
          goto erret;
       }
    }
    av.intvalue = ptr -> internal_stops;
-   retval = AsnWrite(aip, CONSTRAINT_internal_stops,  &av);
+   retval = AsnWrite(aip, TRANSLATION_CONSTRAINT_internal_stops,  &av);
    if (ptr -> num_mismatches != NULL) {
-      if ( ! QuantityConstraintAsnWrite(ptr -> num_mismatches, aip, CONSTRAINT_num_mismatches)) {
+      if ( ! QuantityConstraintAsnWrite(ptr -> num_mismatches, aip, TRANSLATION_CONSTRAINT_num_mismatches)) {
          goto erret;
       }
    }
@@ -9422,11 +9435,11 @@ ConstraintChoiceAsnRead(AsnIoPtr aip, AsnTypePtr orig)
       choice = ConstraintChoice_source;
       func = (AsnReadFunc) SourceConstraintAsnRead;
    }
-   else if (atp == CHOICE_cdsgeneprot_qual) {
+   else if (atp == CONSTRAINT_CHOICE_cdsgeneprot_qual) {
       choice = ConstraintChoice_cdsgeneprot_qual;
       func = (AsnReadFunc) CDSGeneProtQualConstraintAsnRead;
    }
-   else if (atp == CHOICE_cdsgeneprot_pseudo) {
+   else if (atp == CONSTRAINT_CHOICE_cdsgeneprot_pseudo) {
       choice = ConstraintChoice_cdsgeneprot_pseudo;
       func = (AsnReadFunc) CDSGeneProtPseudoConstraintAsnRead;
    }
@@ -9528,11 +9541,11 @@ ConstraintChoiceAsnWrite(ConstraintChoicePtr anp, AsnIoPtr aip, AsnTypePtr orig)
       func = (AsnWriteFunc) SourceConstraintAsnWrite;
       break;
    case ConstraintChoice_cdsgeneprot_qual:
-      writetype = CHOICE_cdsgeneprot_qual;
+      writetype = CONSTRAINT_CHOICE_cdsgeneprot_qual;
       func = (AsnWriteFunc) CDSGeneProtQualConstraintAsnWrite;
       break;
    case ConstraintChoice_cdsgeneprot_pseudo:
-      writetype = CHOICE_cdsgeneprot_pseudo;
+      writetype = CONSTRAINT_CHOICE_cdsgeneprot_pseudo;
       func = (AsnWriteFunc) CDSGeneProtPseudoConstraintAsnWrite;
       break;
    case ConstraintChoice_sequence:
@@ -10392,7 +10405,7 @@ FieldPairTypeAsnRead(AsnIoPtr aip, AsnTypePtr orig)
       choice = FieldPairType_molinfo_field;
       func = (AsnReadFunc) MolinfoFieldPairAsnRead;
    }
-   else if (atp == PAIR_TYPE_struc_comment_field) {
+   else if (atp == FIELD_PAIR_TYPE_struc_comment_field) {
       choice = FieldPairType_struc_comment_field;
       func = (AsnReadFunc) StructuredCommentFieldPairAsnRead;
    }
@@ -10482,7 +10495,7 @@ FieldPairTypeAsnWrite(FieldPairTypePtr anp, AsnIoPtr aip, AsnTypePtr orig)
       func = (AsnWriteFunc) MolinfoFieldPairAsnWrite;
       break;
    case FieldPairType_struc_comment_field:
-      writetype = PAIR_TYPE_struc_comment_field;
+      writetype = FIELD_PAIR_TYPE_struc_comment_field;
       func = (AsnWriteFunc) StructuredCommentFieldPairAsnWrite;
       break;
    case FieldPairType_dblink:
@@ -11778,7 +11791,7 @@ AECRParseActionAsnRead(AsnIoPtr aip, AsnTypePtr orig)
       }
       atp = AsnReadId(aip,amp, atp);
    }
-   if (atp == ACTION_remove_from_parsed) {
+   if (atp == AECRPARSE_ACTION_remove_from_parsed) {
       if ( AsnReadVal(aip, atp, &av) <= 0) {
          goto erret;
       }
@@ -11875,7 +11888,7 @@ AECRParseActionAsnWrite(AECRParseActionPtr ptr, AsnIoPtr aip, AsnTypePtr orig)
       }
    }
    av.boolvalue = ptr -> remove_from_parsed;
-   retval = AsnWrite(aip, ACTION_remove_from_parsed,  &av);
+   retval = AsnWrite(aip, AECRPARSE_ACTION_remove_from_parsed,  &av);
    av.boolvalue = ptr -> remove_left;
    retval = AsnWrite(aip, AECRPARSE_ACTION_remove_left,  &av);
    av.boolvalue = ptr -> remove_right;
@@ -12057,6 +12070,185 @@ erret:
 
 /**************************************************
 *
+*    RemoveOutsideActionNew()
+*
+**************************************************/
+NLM_EXTERN 
+RemoveOutsideActionPtr LIBCALL
+RemoveOutsideActionNew(void)
+{
+   RemoveOutsideActionPtr ptr = MemNew((size_t) sizeof(RemoveOutsideAction));
+
+   ptr -> remove_if_not_found = 0;
+   return ptr;
+
+}
+
+
+/**************************************************
+*
+*    RemoveOutsideActionFree()
+*
+**************************************************/
+NLM_EXTERN 
+RemoveOutsideActionPtr LIBCALL
+RemoveOutsideActionFree(RemoveOutsideActionPtr ptr)
+{
+
+   if(ptr == NULL) {
+      return NULL;
+   }
+   TextPortionFree(ptr -> portion);
+   FieldTypeFree(ptr -> field);
+   return MemFree(ptr);
+}
+
+
+/**************************************************
+*
+*    RemoveOutsideActionAsnRead()
+*
+**************************************************/
+NLM_EXTERN 
+RemoveOutsideActionPtr LIBCALL
+RemoveOutsideActionAsnRead(AsnIoPtr aip, AsnTypePtr orig)
+{
+   DataVal av;
+   AsnTypePtr atp;
+   Boolean isError = FALSE;
+   AsnReadFunc func;
+   RemoveOutsideActionPtr ptr;
+
+   if (! loaded)
+   {
+      if (! objmacroAsnLoad()) {
+         return NULL;
+      }
+   }
+
+   if (aip == NULL) {
+      return NULL;
+   }
+
+   if (orig == NULL) {         /* RemoveOutsideAction ::= (self contained) */
+      atp = AsnReadId(aip, amp, REMOVE_OUTSIDE_ACTION);
+   } else {
+      atp = AsnLinkType(orig, REMOVE_OUTSIDE_ACTION);
+   }
+   /* link in local tree */
+   if (atp == NULL) {
+      return NULL;
+   }
+
+   ptr = RemoveOutsideActionNew();
+   if (ptr == NULL) {
+      goto erret;
+   }
+   if (AsnReadVal(aip, atp, &av) <= 0) { /* read the start struct */
+      goto erret;
+   }
+
+   atp = AsnReadId(aip,amp, atp);
+   func = NULL;
+
+   if (atp == REMOVE_OUTSIDE_ACTION_portion) {
+      ptr -> portion = TextPortionAsnRead(aip, atp);
+      if (aip -> io_failure) {
+         goto erret;
+      }
+      atp = AsnReadId(aip,amp, atp);
+   }
+   if (atp == REMOVE_OUTSIDE_ACTION_field) {
+      ptr -> field = FieldTypeAsnRead(aip, atp);
+      if (aip -> io_failure) {
+         goto erret;
+      }
+      atp = AsnReadId(aip,amp, atp);
+   }
+   if (atp == REMOVE_OUTSIDE_ACTION_remove_if_not_found) {
+      if ( AsnReadVal(aip, atp, &av) <= 0) {
+         goto erret;
+      }
+      ptr -> remove_if_not_found = av.boolvalue;
+      atp = AsnReadId(aip,amp, atp);
+   }
+
+   if (AsnReadVal(aip, atp, &av) <= 0) {
+      goto erret;
+   }
+   /* end struct */
+
+ret:
+   AsnUnlinkType(orig);       /* unlink local tree */
+   return ptr;
+
+erret:
+   aip -> io_failure = TRUE;
+   ptr = RemoveOutsideActionFree(ptr);
+   goto ret;
+}
+
+
+
+/**************************************************
+*
+*    RemoveOutsideActionAsnWrite()
+*
+**************************************************/
+NLM_EXTERN Boolean LIBCALL 
+RemoveOutsideActionAsnWrite(RemoveOutsideActionPtr ptr, AsnIoPtr aip, AsnTypePtr orig)
+{
+   DataVal av;
+   AsnTypePtr atp;
+   Boolean retval = FALSE;
+
+   if (! loaded)
+   {
+      if (! objmacroAsnLoad()) {
+         return FALSE;
+      }
+   }
+
+   if (aip == NULL) {
+      return FALSE;
+   }
+
+   atp = AsnLinkType(orig, REMOVE_OUTSIDE_ACTION);   /* link local tree */
+   if (atp == NULL) {
+      return FALSE;
+   }
+
+   if (ptr == NULL) { AsnNullValueMsg(aip, atp); goto erret; }
+   if (! AsnOpenStruct(aip, atp, (Pointer) ptr)) {
+      goto erret;
+   }
+
+   if (ptr -> portion != NULL) {
+      if ( ! TextPortionAsnWrite(ptr -> portion, aip, REMOVE_OUTSIDE_ACTION_portion)) {
+         goto erret;
+      }
+   }
+   if (ptr -> field != NULL) {
+      if ( ! FieldTypeAsnWrite(ptr -> field, aip, REMOVE_OUTSIDE_ACTION_field)) {
+         goto erret;
+      }
+   }
+   av.boolvalue = ptr -> remove_if_not_found;
+   retval = AsnWrite(aip, REMOVE_OUTSIDE_ACTION_remove_if_not_found,  &av);
+   if (! AsnCloseStruct(aip, atp, (Pointer)ptr)) {
+      goto erret;
+   }
+   retval = TRUE;
+
+erret:
+   AsnUnlinkType(orig);       /* unlink local tree */
+   return retval;
+}
+
+
+
+/**************************************************
+*
 *    ActionChoiceFree()
 *
 **************************************************/
@@ -12096,6 +12288,9 @@ ActionChoiceFree(ValNodePtr anp)
    case ActionChoice_parse:
       AECRParseActionFree(anp -> data.ptrvalue);
       break;
+   case ActionChoice_remove_outside:
+      RemoveOutsideActionFree(anp -> data.ptrvalue);
+      break;
    }
    return MemFree(anp);
 }
@@ -12180,6 +12375,10 @@ ActionChoiceAsnRead(AsnIoPtr aip, AsnTypePtr orig)
       choice = ActionChoice_parse;
       func = (AsnReadFunc) AECRParseActionAsnRead;
    }
+   else if (atp == ACTION_CHOICE_remove_outside) {
+      choice = ActionChoice_remove_outside;
+      func = (AsnReadFunc) RemoveOutsideActionAsnRead;
+   }
    anp->choice = choice;
    if (func != NULL)
    {
@@ -12269,6 +12468,10 @@ ActionChoiceAsnWrite(ActionChoicePtr anp, AsnIoPtr aip, AsnTypePtr orig)
       writetype = ACTION_CHOICE_parse;
       func = (AsnWriteFunc) AECRParseActionAsnWrite;
       break;
+   case ActionChoice_remove_outside:
+      writetype = ACTION_CHOICE_remove_outside;
+      func = (AsnWriteFunc) RemoveOutsideActionAsnWrite;
+      break;
    }
    if (writetype != NULL) {
       retval = (* func)(pnt, aip, writetype);   /* write it out */
@@ -12360,14 +12563,14 @@ ParseSrcOrgChoiceAsnRead(AsnIoPtr aip, AsnTypePtr orig)
    if (atp == NULL) {
       goto erret;
    }
-   if (atp == SRC_ORG_CHOICE_source_qual) {
+   if (atp == PARSE_SRC_ORG_CHOICE_source_qual) {
       choice = ParseSrcOrgChoice_source_qual;
       if (AsnReadVal(aip, atp, &av) <= 0) {
          goto erret;
       }
       anp->data.intvalue = av.intvalue;
    }
-   else if (atp == CHOICE_taxname_after_binomial) {
+   else if (atp == PARSE_SRC_ORG_CHOICE_taxname_after_binomial) {
       choice = ParseSrcOrgChoice_taxname_after_binomial;
       if (AsnReadVal(aip, atp, &av) <= 0) {
          goto erret;
@@ -12437,11 +12640,11 @@ ParseSrcOrgChoiceAsnWrite(ParseSrcOrgChoicePtr anp, AsnIoPtr aip, AsnTypePtr ori
    {
    case ParseSrcOrgChoice_source_qual:
       av.intvalue = anp->data.intvalue;
-      retval = AsnWrite(aip, SRC_ORG_CHOICE_source_qual, &av);
+      retval = AsnWrite(aip, PARSE_SRC_ORG_CHOICE_source_qual, &av);
       break;
    case ParseSrcOrgChoice_taxname_after_binomial:
       av.boolvalue = anp->data.boolvalue;
-      retval = AsnWrite(aip, CHOICE_taxname_after_binomial, &av);
+      retval = AsnWrite(aip, PARSE_SRC_ORG_CHOICE_taxname_after_binomial, &av);
       break;
    }
    if (writetype != NULL) {
@@ -14188,7 +14391,7 @@ ApplyFeatureActionAsnRead(AsnIoPtr aip, AsnTypePtr orig)
       ptr -> partial3 = av.boolvalue;
       atp = AsnReadId(aip,amp, atp);
    }
-   if (atp == FEATURE_ACTION_plus_strand) {
+   if (atp == APPLY_FEATURE_ACTION_plus_strand) {
       if ( AsnReadVal(aip, atp, &av) <= 0) {
          goto erret;
       }
@@ -14209,7 +14412,7 @@ ApplyFeatureActionAsnRead(AsnIoPtr aip, AsnTypePtr orig)
       }
       atp = AsnReadId(aip,amp, atp);
    }
-   if (atp == FEATURE_ACTION_add_redundant) {
+   if (atp == APPLY_FEATURE_ACTION_add_redundant) {
       if ( AsnReadVal(aip, atp, &av) <= 0) {
          goto erret;
       }
@@ -14223,14 +14426,14 @@ ApplyFeatureActionAsnRead(AsnIoPtr aip, AsnTypePtr orig)
       ptr -> add_mrna = av.boolvalue;
       atp = AsnReadId(aip,amp, atp);
    }
-   if (atp == FEATURE_ACTION_apply_to_parts) {
+   if (atp == APPLY_FEATURE_ACTION_apply_to_parts) {
       if ( AsnReadVal(aip, atp, &av) <= 0) {
          goto erret;
       }
       ptr -> apply_to_parts = av.boolvalue;
       atp = AsnReadId(aip,amp, atp);
    }
-   if (atp == FEATURE_ACTION_only_seg_num) {
+   if (atp == APPLY_FEATURE_ACTION_only_seg_num) {
       if ( AsnReadVal(aip, atp, &av) <= 0) {
          goto erret;
       }
@@ -14309,7 +14512,7 @@ ApplyFeatureActionAsnWrite(ApplyFeatureActionPtr ptr, AsnIoPtr aip, AsnTypePtr o
    av.boolvalue = ptr -> partial3;
    retval = AsnWrite(aip, APPLY_FEATURE_ACTION_partial3,  &av);
    av.boolvalue = ptr -> plus_strand;
-   retval = AsnWrite(aip, FEATURE_ACTION_plus_strand,  &av);
+   retval = AsnWrite(aip, APPLY_FEATURE_ACTION_plus_strand,  &av);
    if (ptr -> location != NULL) {
       if ( ! LocationChoiceAsnWrite(ptr -> location, aip, APPLY_FEATURE_ACTION_location)) {
          goto erret;
@@ -14321,13 +14524,13 @@ ApplyFeatureActionAsnWrite(ApplyFeatureActionPtr ptr, AsnIoPtr aip, AsnTypePtr o
       }
    }
    av.boolvalue = ptr -> add_redundant;
-   retval = AsnWrite(aip, FEATURE_ACTION_add_redundant,  &av);
+   retval = AsnWrite(aip, APPLY_FEATURE_ACTION_add_redundant,  &av);
    av.boolvalue = ptr -> add_mrna;
    retval = AsnWrite(aip, APPLY_FEATURE_ACTION_add_mrna,  &av);
    av.boolvalue = ptr -> apply_to_parts;
-   retval = AsnWrite(aip, FEATURE_ACTION_apply_to_parts,  &av);
+   retval = AsnWrite(aip, APPLY_FEATURE_ACTION_apply_to_parts,  &av);
    av.intvalue = ptr -> only_seg_num;
-   retval = AsnWrite(aip, FEATURE_ACTION_only_seg_num,  &av);
+   retval = AsnWrite(aip, APPLY_FEATURE_ACTION_only_seg_num,  &av);
    if (ptr -> fields != NULL) {
       if ( ! FeatQualLegalSetAsnWrite(ptr -> fields, aip, APPLY_FEATURE_ACTION_fields)) {
          goto erret;
@@ -14438,7 +14641,7 @@ RemoveFeatureActionAsnRead(AsnIoPtr aip, AsnTypePtr orig)
       ptr -> type = av.intvalue;
       atp = AsnReadId(aip,amp, atp);
    }
-   if (atp == FEATURE_ACTION_constraint) {
+   if (atp == REMOVE_FEATURE_ACTION_constraint) {
       ptr -> constraint = ConstraintChoiceSetAsnRead(aip, atp);
       if (aip -> io_failure) {
          goto erret;
@@ -14499,7 +14702,7 @@ RemoveFeatureActionAsnWrite(RemoveFeatureActionPtr ptr, AsnIoPtr aip, AsnTypePtr
    av.intvalue = ptr -> type;
    retval = AsnWrite(aip, REMOVE_FEATURE_ACTION_type,  &av);
    if (ptr -> constraint != NULL) {
-      if ( ! ConstraintChoiceSetAsnWrite(ptr -> constraint, aip, FEATURE_ACTION_constraint)) {
+      if ( ! ConstraintChoiceSetAsnWrite(ptr -> constraint, aip, REMOVE_FEATURE_ACTION_constraint)) {
          goto erret;
       }
    }
@@ -14595,21 +14798,21 @@ ConvertFromCDSOptionsAsnRead(AsnIoPtr aip, AsnTypePtr orig)
    atp = AsnReadId(aip,amp, atp);
    func = NULL;
 
-   if (atp == FROM_CDS_OPTIONS_remove_mRNA) {
+   if (atp == CONVERT_FROM_CDS_OPTIONS_remove_mRNA) {
       if ( AsnReadVal(aip, atp, &av) <= 0) {
          goto erret;
       }
       ptr -> remove_mRNA = av.boolvalue;
       atp = AsnReadId(aip,amp, atp);
    }
-   if (atp == FROM_CDS_OPTIONS_remove_gene) {
+   if (atp == CONVERT_FROM_CDS_OPTIONS_remove_gene) {
       if ( AsnReadVal(aip, atp, &av) <= 0) {
          goto erret;
       }
       ptr -> remove_gene = av.boolvalue;
       atp = AsnReadId(aip,amp, atp);
    }
-   if (atp == OPTIONS_remove_transcript_id) {
+   if (atp == CONVERT_FROM_CDS_OPTIONS_remove_transcript_id) {
       if ( AsnReadVal(aip, atp, &av) <= 0) {
          goto erret;
       }
@@ -14668,11 +14871,11 @@ ConvertFromCDSOptionsAsnWrite(ConvertFromCDSOptionsPtr ptr, AsnIoPtr aip, AsnTyp
    }
 
    av.boolvalue = ptr -> remove_mRNA;
-   retval = AsnWrite(aip, FROM_CDS_OPTIONS_remove_mRNA,  &av);
+   retval = AsnWrite(aip, CONVERT_FROM_CDS_OPTIONS_remove_mRNA,  &av);
    av.boolvalue = ptr -> remove_gene;
-   retval = AsnWrite(aip, FROM_CDS_OPTIONS_remove_gene,  &av);
+   retval = AsnWrite(aip, CONVERT_FROM_CDS_OPTIONS_remove_gene,  &av);
    av.boolvalue = ptr -> remove_transcript_id;
-   retval = AsnWrite(aip, OPTIONS_remove_transcript_id,  &av);
+   retval = AsnWrite(aip, CONVERT_FROM_CDS_OPTIONS_remove_transcript_id,  &av);
    if (! AsnCloseStruct(aip, atp, (Pointer)ptr)) {
       goto erret;
    }
@@ -15082,32 +15285,32 @@ ConvertFeatureDstOptionsAsnRead(AsnIoPtr aip, AsnTypePtr orig)
    if (atp == NULL) {
       goto erret;
    }
-   if (atp == FEATURE_DST_OPTIONS_bond) {
+   if (atp == CONVERT_FEATURE_DST_OPTIONS_bond) {
       choice = ConvertFeatureDstOptions_bond;
       if (AsnReadVal(aip, atp, &av) <= 0) {
          goto erret;
       }
       anp->data.intvalue = av.intvalue;
    }
-   else if (atp == FEATURE_DST_OPTIONS_site) {
+   else if (atp == CONVERT_FEATURE_DST_OPTIONS_site) {
       choice = ConvertFeatureDstOptions_site;
       if (AsnReadVal(aip, atp, &av) <= 0) {
          goto erret;
       }
       anp->data.intvalue = av.intvalue;
    }
-   else if (atp == FEATURE_DST_OPTIONS_region) {
+   else if (atp == CONVERT_FEATURE_DST_OPTIONS_region) {
       choice = ConvertFeatureDstOptions_region;
       func = (AsnReadFunc) RegionTypeAsnRead;
    }
-   else if (atp == DST_OPTIONS_ncrna_class) {
+   else if (atp == CONVERT_FEATURE_DST_OPTIONS_ncrna_class) {
       choice = ConvertFeatureDstOptions_ncrna_class;
       if (AsnReadVal(aip, atp, &av) <= 0) {
          goto erret;
       }
       anp->data.ptrvalue = av.ptrvalue;
    }
-   else if (atp == DST_OPTIONS_remove_original) {
+   else if (atp == CONVERT_FEATURE_DST_OPTIONS_remove_original) {
       choice = ConvertFeatureDstOptions_remove_original;
       if (AsnReadVal(aip, atp, &av) <= 0) {
          goto erret;
@@ -15177,23 +15380,23 @@ ConvertFeatureDstOptionsAsnWrite(ConvertFeatureDstOptionsPtr anp, AsnIoPtr aip,
    {
    case ConvertFeatureDstOptions_bond:
       av.intvalue = anp->data.intvalue;
-      retval = AsnWrite(aip, FEATURE_DST_OPTIONS_bond, &av);
+      retval = AsnWrite(aip, CONVERT_FEATURE_DST_OPTIONS_bond, &av);
       break;
    case ConvertFeatureDstOptions_site:
       av.intvalue = anp->data.intvalue;
-      retval = AsnWrite(aip, FEATURE_DST_OPTIONS_site, &av);
+      retval = AsnWrite(aip, CONVERT_FEATURE_DST_OPTIONS_site, &av);
       break;
    case ConvertFeatureDstOptions_region:
-      writetype = FEATURE_DST_OPTIONS_region;
+      writetype = CONVERT_FEATURE_DST_OPTIONS_region;
       func = (AsnWriteFunc) RegionTypeAsnWrite;
       break;
    case ConvertFeatureDstOptions_ncrna_class:
       av.ptrvalue = anp->data.ptrvalue;
-      retval = AsnWrite(aip, DST_OPTIONS_ncrna_class, &av);
+      retval = AsnWrite(aip, CONVERT_FEATURE_DST_OPTIONS_ncrna_class, &av);
       break;
    case ConvertFeatureDstOptions_remove_original:
       av.boolvalue = anp->data.boolvalue;
-      retval = AsnWrite(aip, DST_OPTIONS_remove_original, &av);
+      retval = AsnWrite(aip, CONVERT_FEATURE_DST_OPTIONS_remove_original, &av);
       break;
    }
    if (writetype != NULL) {
@@ -15293,7 +15496,7 @@ ConvertFeatureActionAsnRead(AsnIoPtr aip, AsnTypePtr orig)
    atp = AsnReadId(aip,amp, atp);
    func = NULL;
 
-   if (atp == FEATURE_ACTION_type_from) {
+   if (atp == CONVERT_FEATURE_ACTION_type_from) {
       if ( AsnReadVal(aip, atp, &av) <= 0) {
          goto erret;
       }
@@ -15307,28 +15510,28 @@ ConvertFeatureActionAsnRead(AsnIoPtr aip, AsnTypePtr orig)
       ptr -> type_to = av.intvalue;
       atp = AsnReadId(aip,amp, atp);
    }
-   if (atp == FEATURE_ACTION_src_options) {
+   if (atp == CONVERT_FEATURE_ACTION_src_options) {
       ptr -> src_options = ConvertFeatureSrcOptionsAsnRead(aip, atp);
       if (aip -> io_failure) {
          goto erret;
       }
       atp = AsnReadId(aip,amp, atp);
    }
-   if (atp == FEATURE_ACTION_dst_options) {
+   if (atp == CONVERT_FEATURE_ACTION_dst_options) {
       ptr -> dst_options = ConvertFeatureDstOptionsAsnRead(aip, atp);
       if (aip -> io_failure) {
          goto erret;
       }
       atp = AsnReadId(aip,amp, atp);
    }
-   if (atp == FEATURE_ACTION_leave_original) {
+   if (atp == CONVERT_FEATURE_ACTION_leave_original) {
       if ( AsnReadVal(aip, atp, &av) <= 0) {
          goto erret;
       }
       ptr -> leave_original = av.boolvalue;
       atp = AsnReadId(aip,amp, atp);
    }
-   if (atp == ACTION_src_feat_constraint) {
+   if (atp == CONVERT_FEATURE_ACTION_src_feat_constraint) {
       ptr -> src_feat_constraint = ConstraintChoiceSetAsnRead(aip, atp);
       if (aip -> io_failure) {
          goto erret;
@@ -15387,23 +15590,23 @@ ConvertFeatureActionAsnWrite(ConvertFeatureActionPtr ptr, AsnIoPtr aip, AsnTypeP
    }
 
    av.intvalue = ptr -> type_from;
-   retval = AsnWrite(aip, FEATURE_ACTION_type_from,  &av);
+   retval = AsnWrite(aip, CONVERT_FEATURE_ACTION_type_from,  &av);
    av.intvalue = ptr -> type_to;
    retval = AsnWrite(aip, CONVERT_FEATURE_ACTION_type_to,  &av);
    if (ptr -> src_options != NULL) {
-      if ( ! ConvertFeatureSrcOptionsAsnWrite(ptr -> src_options, aip, FEATURE_ACTION_src_options)) {
+      if ( ! ConvertFeatureSrcOptionsAsnWrite(ptr -> src_options, aip, CONVERT_FEATURE_ACTION_src_options)) {
          goto erret;
       }
    }
    if (ptr -> dst_options != NULL) {
-      if ( ! ConvertFeatureDstOptionsAsnWrite(ptr -> dst_options, aip, FEATURE_ACTION_dst_options)) {
+      if ( ! ConvertFeatureDstOptionsAsnWrite(ptr -> dst_options, aip, CONVERT_FEATURE_ACTION_dst_options)) {
          goto erret;
       }
    }
    av.boolvalue = ptr -> leave_original;
-   retval = AsnWrite(aip, FEATURE_ACTION_leave_original,  &av);
+   retval = AsnWrite(aip, CONVERT_FEATURE_ACTION_leave_original,  &av);
    if (ptr -> src_feat_constraint != NULL) {
-      if ( ! ConstraintChoiceSetAsnWrite(ptr -> src_feat_constraint, aip, ACTION_src_feat_constraint)) {
+      if ( ! ConstraintChoiceSetAsnWrite(ptr -> src_feat_constraint, aip, CONVERT_FEATURE_ACTION_src_feat_constraint)) {
          goto erret;
       }
    }
@@ -15499,7 +15702,7 @@ EditLocationStrandAsnRead(AsnIoPtr aip, AsnTypePtr orig)
    atp = AsnReadId(aip,amp, atp);
    func = NULL;
 
-   if (atp == LOCATION_STRAND_strand_from) {
+   if (atp == EDIT_LOCATION_STRAND_strand_from) {
       if ( AsnReadVal(aip, atp, &av) <= 0) {
          goto erret;
       }
@@ -15565,7 +15768,7 @@ EditLocationStrandAsnWrite(EditLocationStrandPtr ptr, AsnIoPtr aip, AsnTypePtr o
    }
 
    av.intvalue = ptr -> strand_from;
-   retval = AsnWrite(aip, LOCATION_STRAND_strand_from,  &av);
+   retval = AsnWrite(aip, EDIT_LOCATION_STRAND_strand_from,  &av);
    av.intvalue = ptr -> strand_to;
    retval = AsnWrite(aip, EDIT_LOCATION_STRAND_strand_to,  &av);
    if (! AsnCloseStruct(aip, atp, (Pointer)ptr)) {
@@ -15982,7 +16185,7 @@ PartialBothSetActionAsnRead(AsnIoPtr aip, AsnTypePtr orig)
    atp = AsnReadId(aip,amp, atp);
    func = NULL;
 
-   if (atp == BOTH_SET_ACTION_constraint) {
+   if (atp == PARTIAL_BOTH_SET_ACTION_constraint) {
       if ( AsnReadVal(aip, atp, &av) <= 0) {
          goto erret;
       }
@@ -16048,7 +16251,7 @@ PartialBothSetActionAsnWrite(PartialBothSetActionPtr ptr, AsnIoPtr aip, AsnTypeP
    }
 
    av.intvalue = ptr -> constraint;
-   retval = AsnWrite(aip, BOTH_SET_ACTION_constraint,  &av);
+   retval = AsnWrite(aip, PARTIAL_BOTH_SET_ACTION_constraint,  &av);
    av.boolvalue = ptr -> extend;
    retval = AsnWrite(aip, PARTIAL_BOTH_SET_ACTION_extend,  &av);
    if (! AsnCloseStruct(aip, atp, (Pointer)ptr)) {
@@ -16065,6 +16268,180 @@ erret:
 
 /**************************************************
 *
+*    ExtendToFeatureNew()
+*
+**************************************************/
+NLM_EXTERN 
+ExtendToFeaturePtr LIBCALL
+ExtendToFeatureNew(void)
+{
+   ExtendToFeaturePtr ptr = MemNew((size_t) sizeof(ExtendToFeature));
+
+   return ptr;
+
+}
+
+
+/**************************************************
+*
+*    ExtendToFeatureFree()
+*
+**************************************************/
+NLM_EXTERN 
+ExtendToFeaturePtr LIBCALL
+ExtendToFeatureFree(ExtendToFeaturePtr ptr)
+{
+
+   if(ptr == NULL) {
+      return NULL;
+   }
+   QuantityConstraintFree(ptr -> distance);
+   return MemFree(ptr);
+}
+
+
+/**************************************************
+*
+*    ExtendToFeatureAsnRead()
+*
+**************************************************/
+NLM_EXTERN 
+ExtendToFeaturePtr LIBCALL
+ExtendToFeatureAsnRead(AsnIoPtr aip, AsnTypePtr orig)
+{
+   DataVal av;
+   AsnTypePtr atp;
+   Boolean isError = FALSE;
+   AsnReadFunc func;
+   ExtendToFeaturePtr ptr;
+
+   if (! loaded)
+   {
+      if (! objmacroAsnLoad()) {
+         return NULL;
+      }
+   }
+
+   if (aip == NULL) {
+      return NULL;
+   }
+
+   if (orig == NULL) {         /* ExtendToFeature ::= (self contained) */
+      atp = AsnReadId(aip, amp, EXTEND_TO_FEATURE);
+   } else {
+      atp = AsnLinkType(orig, EXTEND_TO_FEATURE);
+   }
+   /* link in local tree */
+   if (atp == NULL) {
+      return NULL;
+   }
+
+   ptr = ExtendToFeatureNew();
+   if (ptr == NULL) {
+      goto erret;
+   }
+   if (AsnReadVal(aip, atp, &av) <= 0) { /* read the start struct */
+      goto erret;
+   }
+
+   atp = AsnReadId(aip,amp, atp);
+   func = NULL;
+
+   if (atp == EXTEND_TO_FEATURE_type) {
+      if ( AsnReadVal(aip, atp, &av) <= 0) {
+         goto erret;
+      }
+      ptr -> type = av.intvalue;
+      atp = AsnReadId(aip,amp, atp);
+   }
+   if (atp == EXTEND_TO_FEATURE_include_feat) {
+      if ( AsnReadVal(aip, atp, &av) <= 0) {
+         goto erret;
+      }
+      ptr -> include_feat = av.boolvalue;
+      atp = AsnReadId(aip,amp, atp);
+   }
+   if (atp == EXTEND_TO_FEATURE_distance) {
+      ptr -> distance = QuantityConstraintAsnRead(aip, atp);
+      if (aip -> io_failure) {
+         goto erret;
+      }
+      atp = AsnReadId(aip,amp, atp);
+   }
+
+   if (AsnReadVal(aip, atp, &av) <= 0) {
+      goto erret;
+   }
+   /* end struct */
+
+ret:
+   AsnUnlinkType(orig);       /* unlink local tree */
+   return ptr;
+
+erret:
+   aip -> io_failure = TRUE;
+   ptr = ExtendToFeatureFree(ptr);
+   goto ret;
+}
+
+
+
+/**************************************************
+*
+*    ExtendToFeatureAsnWrite()
+*
+**************************************************/
+NLM_EXTERN Boolean LIBCALL 
+ExtendToFeatureAsnWrite(ExtendToFeaturePtr ptr, AsnIoPtr aip, AsnTypePtr orig)
+{
+   DataVal av;
+   AsnTypePtr atp;
+   Boolean retval = FALSE;
+
+   if (! loaded)
+   {
+      if (! objmacroAsnLoad()) {
+         return FALSE;
+      }
+   }
+
+   if (aip == NULL) {
+      return FALSE;
+   }
+
+   atp = AsnLinkType(orig, EXTEND_TO_FEATURE);   /* link local tree */
+   if (atp == NULL) {
+      return FALSE;
+   }
+
+   if (ptr == NULL) { AsnNullValueMsg(aip, atp); goto erret; }
+   if (! AsnOpenStruct(aip, atp, (Pointer) ptr)) {
+      goto erret;
+   }
+
+   av.intvalue = ptr -> type;
+   retval = AsnWrite(aip, EXTEND_TO_FEATURE_type,  &av);
+   av.boolvalue = ptr -> include_feat;
+   retval = AsnWrite(aip, EXTEND_TO_FEATURE_include_feat,  &av);
+   if (ptr -> distance != NULL) {
+      if ( ! QuantityConstraintAsnWrite(ptr -> distance, aip, EXTEND_TO_FEATURE_distance)) {
+         goto erret;
+      }
+   }
+   if (! AsnCloseStruct(aip, atp, (Pointer)ptr)) {
+      goto erret;
+   }
+   retval = TRUE;
+
+erret:
+   AsnUnlinkType(orig);       /* unlink local tree */
+   return retval;
+}
+
+
+
+/**************************************************
+*
 *    LocationEditTypeFree()
 *
 **************************************************/
@@ -16095,6 +16472,12 @@ LocationEditTypeFree(ValNodePtr anp)
    case LocationEditType_set_both_partial:
       PartialBothSetActionFree(anp -> data.ptrvalue);
       break;
+   case LocationEditType_extend_5_to_feat:
+      ExtendToFeatureFree(anp -> data.ptrvalue);
+      break;
+   case LocationEditType_extend_3_to_feat:
+      ExtendToFeatureFree(anp -> data.ptrvalue);
+      break;
    }
    return MemFree(anp);
 }
@@ -16155,33 +16538,33 @@ LocationEditTypeAsnRead(AsnIoPtr aip, AsnTypePtr orig)
       choice = LocationEditType_strand;
       func = (AsnReadFunc) EditLocationStrandAsnRead;
    }
-   else if (atp == EDIT_TYPE_set_5_partial) {
+   else if (atp == LOCATION_EDIT_TYPE_set_5_partial) {
       choice = LocationEditType_set_5_partial;
       func = (AsnReadFunc) Partial5SetActionAsnRead;
    }
-   else if (atp == EDIT_TYPE_clear_5_partial) {
+   else if (atp == LOCATION_EDIT_TYPE_clear_5_partial) {
       choice = LocationEditType_clear_5_partial;
       if (AsnReadVal(aip, atp, &av) <= 0) {
          goto erret;
       }
       anp->data.intvalue = av.intvalue;
    }
-   else if (atp == EDIT_TYPE_set_3_partial) {
+   else if (atp == LOCATION_EDIT_TYPE_set_3_partial) {
       choice = LocationEditType_set_3_partial;
       func = (AsnReadFunc) Partial3SetActionAsnRead;
    }
-   else if (atp == EDIT_TYPE_clear_3_partial) {
+   else if (atp == LOCATION_EDIT_TYPE_clear_3_partial) {
       choice = LocationEditType_clear_3_partial;
       if (AsnReadVal(aip, atp, &av) <= 0) {
          goto erret;
       }
       anp->data.intvalue = av.intvalue;
    }
-   else if (atp == EDIT_TYPE_set_both_partial) {
+   else if (atp == LOCATION_EDIT_TYPE_set_both_partial) {
       choice = LocationEditType_set_both_partial;
       func = (AsnReadFunc) PartialBothSetActionAsnRead;
    }
-   else if (atp == EDIT_TYPE_clear_both_partial) {
+   else if (atp == LOCATION_EDIT_TYPE_clear_both_partial) {
       choice = LocationEditType_clear_both_partial;
       if (AsnReadVal(aip, atp, &av) <= 0) {
          goto erret;
@@ -16209,6 +16592,14 @@ LocationEditTypeAsnRead(AsnIoPtr aip, AsnTypePtr orig)
       }
       anp->data.boolvalue = av.boolvalue;
    }
+   else if (atp == LOCATION_EDIT_TYPE_extend_5_to_feat) {
+      choice = LocationEditType_extend_5_to_feat;
+      func = (AsnReadFunc) ExtendToFeatureAsnRead;
+   }
+   else if (atp == LOCATION_EDIT_TYPE_extend_3_to_feat) {
+      choice = LocationEditType_extend_3_to_feat;
+      func = (AsnReadFunc) ExtendToFeatureAsnRead;
+   }
    anp->choice = choice;
    if (func != NULL)
    {
@@ -16275,28 +16666,28 @@ LocationEditTypeAsnWrite(LocationEditTypePtr anp, AsnIoPtr aip, AsnTypePtr orig)
       func = (AsnWriteFunc) EditLocationStrandAsnWrite;
       break;
    case LocationEditType_set_5_partial:
-      writetype = EDIT_TYPE_set_5_partial;
+      writetype = LOCATION_EDIT_TYPE_set_5_partial;
       func = (AsnWriteFunc) Partial5SetActionAsnWrite;
       break;
    case LocationEditType_clear_5_partial:
       av.intvalue = anp->data.intvalue;
-      retval = AsnWrite(aip, EDIT_TYPE_clear_5_partial, &av);
+      retval = AsnWrite(aip, LOCATION_EDIT_TYPE_clear_5_partial, &av);
       break;
    case LocationEditType_set_3_partial:
-      writetype = EDIT_TYPE_set_3_partial;
+      writetype = LOCATION_EDIT_TYPE_set_3_partial;
       func = (AsnWriteFunc) Partial3SetActionAsnWrite;
       break;
    case LocationEditType_clear_3_partial:
       av.intvalue = anp->data.intvalue;
-      retval = AsnWrite(aip, EDIT_TYPE_clear_3_partial, &av);
+      retval = AsnWrite(aip, LOCATION_EDIT_TYPE_clear_3_partial, &av);
       break;
    case LocationEditType_set_both_partial:
-      writetype = EDIT_TYPE_set_both_partial;
+      writetype = LOCATION_EDIT_TYPE_set_both_partial;
       func = (AsnWriteFunc) PartialBothSetActionAsnWrite;
       break;
    case LocationEditType_clear_both_partial:
       av.intvalue = anp->data.intvalue;
-      retval = AsnWrite(aip, EDIT_TYPE_clear_both_partial, &av);
+      retval = AsnWrite(aip, LOCATION_EDIT_TYPE_clear_both_partial, &av);
       break;
    case LocationEditType_convert:
       av.intvalue = anp->data.intvalue;
@@ -16310,6 +16701,14 @@ LocationEditTypeAsnWrite(LocationEditTypePtr anp, AsnIoPtr aip, AsnTypePtr orig)
       av.boolvalue = anp->data.boolvalue;
       retval = AsnWrite(aip, LOCATION_EDIT_TYPE_extend_3, &av);
       break;
+   case LocationEditType_extend_5_to_feat:
+      writetype = LOCATION_EDIT_TYPE_extend_5_to_feat;
+      func = (AsnWriteFunc) ExtendToFeatureAsnWrite;
+      break;
+   case LocationEditType_extend_3_to_feat:
+      writetype = LOCATION_EDIT_TYPE_extend_3_to_feat;
+      func = (AsnWriteFunc) ExtendToFeatureAsnWrite;
+      break;
    }
    if (writetype != NULL) {
       retval = (* func)(pnt, aip, writetype);   /* write it out */
@@ -16407,28 +16806,35 @@ EditFeatureLocationActionAsnRead(AsnIoPtr aip, AsnTypePtr orig)
    atp = AsnReadId(aip,amp, atp);
    func = NULL;
 
-   if (atp == FEATURE_LOCATION_ACTION_type) {
+   if (atp == EDIT_FEATURE_LOCATION_ACTION_type) {
       if ( AsnReadVal(aip, atp, &av) <= 0) {
          goto erret;
       }
       ptr -> type = av.intvalue;
       atp = AsnReadId(aip,amp, atp);
    }
-   if (atp == FEATURE_LOCATION_ACTION_action) {
+   if (atp == EDIT_FEATURE_LOCATION_ACTION_action) {
       ptr -> action = LocationEditTypeAsnRead(aip, atp);
       if (aip -> io_failure) {
          goto erret;
       }
       atp = AsnReadId(aip,amp, atp);
    }
-   if (atp == ACTION_retranslate_cds) {
+   if (atp == EDIT_FEATURE_LOCATION_ACTION_retranslate_cds) {
       if ( AsnReadVal(aip, atp, &av) <= 0) {
          goto erret;
       }
       ptr -> retranslate_cds = av.boolvalue;
       atp = AsnReadId(aip,amp, atp);
    }
-   if (atp == LOCATION_ACTION_constraint) {
+   if (atp == EDIT_FEATURE_LOCATION_ACTION_also_edit_gene) {
+      if ( AsnReadVal(aip, atp, &av) <= 0) {
+         goto erret;
+      }
+      ptr -> also_edit_gene = av.boolvalue;
+      atp = AsnReadId(aip,amp, atp);
+   }
+   if (atp == EDIT_FEATURE_LOCATION_ACTION_constraint) {
       ptr -> constraint = ConstraintChoiceSetAsnRead(aip, atp);
       if (aip -> io_failure) {
          goto erret;
@@ -16487,16 +16893,18 @@ EditFeatureLocationActionAsnWrite(EditFeatureLocationActionPtr ptr, AsnIoPtr aip
    }
 
    av.intvalue = ptr -> type;
-   retval = AsnWrite(aip, FEATURE_LOCATION_ACTION_type,  &av);
+   retval = AsnWrite(aip, EDIT_FEATURE_LOCATION_ACTION_type,  &av);
    if (ptr -> action != NULL) {
-      if ( ! LocationEditTypeAsnWrite(ptr -> action, aip, FEATURE_LOCATION_ACTION_action)) {
+      if ( ! LocationEditTypeAsnWrite(ptr -> action, aip, EDIT_FEATURE_LOCATION_ACTION_action)) {
          goto erret;
       }
    }
    av.boolvalue = ptr -> retranslate_cds;
-   retval = AsnWrite(aip, ACTION_retranslate_cds,  &av);
+   retval = AsnWrite(aip, EDIT_FEATURE_LOCATION_ACTION_retranslate_cds,  &av);
+   av.boolvalue = ptr -> also_edit_gene;
+   retval = AsnWrite(aip, EDIT_FEATURE_LOCATION_ACTION_also_edit_gene,  &av);
    if (ptr -> constraint != NULL) {
-      if ( ! ConstraintChoiceSetAsnWrite(ptr -> constraint, aip, LOCATION_ACTION_constraint)) {
+      if ( ! ConstraintChoiceSetAsnWrite(ptr -> constraint, aip, EDIT_FEATURE_LOCATION_ACTION_constraint)) {
          goto erret;
       }
    }
@@ -16782,7 +17190,7 @@ RemoveDescriptorActionAsnRead(AsnIoPtr aip, AsnTypePtr orig)
       ptr -> type = av.intvalue;
       atp = AsnReadId(aip,amp, atp);
    }
-   if (atp == DESCRIPTOR_ACTION_constraint) {
+   if (atp == REMOVE_DESCRIPTOR_ACTION_constraint) {
       ptr -> constraint = ConstraintChoiceSetAsnRead(aip, atp);
       if (aip -> io_failure) {
          goto erret;
@@ -16843,7 +17251,7 @@ RemoveDescriptorActionAsnWrite(RemoveDescriptorActionPtr ptr, AsnIoPtr aip, AsnT
    av.intvalue = ptr -> type;
    retval = AsnWrite(aip, REMOVE_DESCRIPTOR_ACTION_type,  &av);
    if (ptr -> constraint != NULL) {
-      if ( ! ConstraintChoiceSetAsnWrite(ptr -> constraint, aip, DESCRIPTOR_ACTION_constraint)) {
+      if ( ! ConstraintChoiceSetAsnWrite(ptr -> constraint, aip, REMOVE_DESCRIPTOR_ACTION_constraint)) {
          goto erret;
       }
    }
@@ -16870,6 +17278,7 @@ AutodefActionNew(void)
 {
    AutodefActionPtr ptr = MemNew((size_t) sizeof(AutodefAction));
 
+   ptr -> misc_feat_parse_rule = 2;
    return ptr;
 
 }
@@ -16954,6 +17363,13 @@ AutodefActionAsnRead(AsnIoPtr aip, AsnTypePtr orig)
       ptr -> clause_list_type = av.intvalue;
       atp = AsnReadId(aip,amp, atp);
    }
+   if (atp == AUTODEF_ACTION_misc_feat_parse_rule) {
+      if ( AsnReadVal(aip, atp, &av) <= 0) {
+         goto erret;
+      }
+      ptr -> misc_feat_parse_rule = av.intvalue;
+      atp = AsnReadId(aip,amp, atp);
+   }
 
    if (AsnReadVal(aip, atp, &av) <= 0) {
       goto erret;
@@ -17008,6 +17424,8 @@ AutodefActionAsnWrite(AutodefActionPtr ptr, AsnIoPtr aip, AsnTypePtr orig)
    retval = AsnGenericBaseSeqOfAsnWrite(ptr -> modifiers ,ASNCODE_INTVAL_SLOT, aip, AUTODEF_ACTION_modifiers, AUTODEF_ACTION_modifiers_E);
    av.intvalue = ptr -> clause_list_type;
    retval = AsnWrite(aip, AUTODEF_ACTION_clause_list_type,  &av);
+   av.intvalue = ptr -> misc_feat_parse_rule;
+   retval = AsnWrite(aip, AUTODEF_ACTION_misc_feat_parse_rule,  &av);
    if (! AsnCloseStruct(aip, atp, (Pointer)ptr)) {
       goto erret;
    }
@@ -17123,7 +17541,7 @@ FixPubCapsActionAsnRead(AsnIoPtr aip, AsnTypePtr orig)
       ptr -> affiliation = av.boolvalue;
       atp = AsnReadId(aip,amp, atp);
    }
-   if (atp == PUB_CAPS_ACTION_affil_country) {
+   if (atp == FIX_PUB_CAPS_ACTION_affil_country) {
       if ( AsnReadVal(aip, atp, &av) <= 0) {
          goto erret;
       }
@@ -17202,7 +17620,7 @@ FixPubCapsActionAsnWrite(FixPubCapsActionPtr ptr, AsnIoPtr aip, AsnTypePtr orig)
    av.boolvalue = ptr -> affiliation;
    retval = AsnWrite(aip, FIX_PUB_CAPS_ACTION_affiliation,  &av);
    av.boolvalue = ptr -> affil_country;
-   retval = AsnWrite(aip, PUB_CAPS_ACTION_affil_country,  &av);
+   retval = AsnWrite(aip, FIX_PUB_CAPS_ACTION_affil_country,  &av);
    av.boolvalue = ptr -> punct_only;
    retval = AsnWrite(aip, FIX_PUB_CAPS_ACTION_punct_only,  &av);
    if (ptr -> constraint != NULL) {
@@ -17402,6 +17820,158 @@ erret:
 
 /**************************************************
 *
+*    FixAuthorCapsNew()
+*
+**************************************************/
+NLM_EXTERN 
+FixAuthorCapsPtr LIBCALL
+FixAuthorCapsNew(void)
+{
+   FixAuthorCapsPtr ptr = MemNew((size_t) sizeof(FixAuthorCaps));
+
+   return ptr;
+
+}
+
+
+/**************************************************
+*
+*    FixAuthorCapsFree()
+*
+**************************************************/
+NLM_EXTERN 
+FixAuthorCapsPtr LIBCALL
+FixAuthorCapsFree(FixAuthorCapsPtr ptr)
+{
+
+   if(ptr == NULL) {
+      return NULL;
+   }
+   return MemFree(ptr);
+}
+
+
+/**************************************************
+*
+*    FixAuthorCapsAsnRead()
+*
+**************************************************/
+NLM_EXTERN 
+FixAuthorCapsPtr LIBCALL
+FixAuthorCapsAsnRead(AsnIoPtr aip, AsnTypePtr orig)
+{
+   DataVal av;
+   AsnTypePtr atp;
+   Boolean isError = FALSE;
+   AsnReadFunc func;
+   FixAuthorCapsPtr ptr;
+
+   if (! loaded)
+   {
+      if (! objmacroAsnLoad()) {
+         return NULL;
+      }
+   }
+
+   if (aip == NULL) {
+      return NULL;
+   }
+
+   if (orig == NULL) {         /* FixAuthorCaps ::= (self contained) */
+      atp = AsnReadId(aip, amp, FIX_AUTHOR_CAPS);
+   } else {
+      atp = AsnLinkType(orig, FIX_AUTHOR_CAPS);
+   }
+   /* link in local tree */
+   if (atp == NULL) {
+      return NULL;
+   }
+
+   ptr = FixAuthorCapsNew();
+   if (ptr == NULL) {
+      goto erret;
+   }
+   if (AsnReadVal(aip, atp, &av) <= 0) { /* read the start struct */
+      goto erret;
+   }
+
+   atp = AsnReadId(aip,amp, atp);
+   func = NULL;
+
+   if (atp == FIX_AUTHOR_CAPS_last_name_only) {
+      if ( AsnReadVal(aip, atp, &av) <= 0) {
+         goto erret;
+      }
+      ptr -> last_name_only = av.boolvalue;
+      atp = AsnReadId(aip,amp, atp);
+   }
+
+   if (AsnReadVal(aip, atp, &av) <= 0) {
+      goto erret;
+   }
+   /* end struct */
+
+ret:
+   AsnUnlinkType(orig);       /* unlink local tree */
+   return ptr;
+
+erret:
+   aip -> io_failure = TRUE;
+   ptr = FixAuthorCapsFree(ptr);
+   goto ret;
+}
+
+
+
+/**************************************************
+*
+*    FixAuthorCapsAsnWrite()
+*
+**************************************************/
+NLM_EXTERN Boolean LIBCALL 
+FixAuthorCapsAsnWrite(FixAuthorCapsPtr ptr, AsnIoPtr aip, AsnTypePtr orig)
+{
+   DataVal av;
+   AsnTypePtr atp;
+   Boolean retval = FALSE;
+
+   if (! loaded)
+   {
+      if (! objmacroAsnLoad()) {
+         return FALSE;
+      }
+   }
+
+   if (aip == NULL) {
+      return FALSE;
+   }
+
+   atp = AsnLinkType(orig, FIX_AUTHOR_CAPS);   /* link local tree */
+   if (atp == NULL) {
+      return FALSE;
+   }
+
+   if (ptr == NULL) { AsnNullValueMsg(aip, atp); goto erret; }
+   if (! AsnOpenStruct(aip, atp, (Pointer) ptr)) {
+      goto erret;
+   }
+
+   av.boolvalue = ptr -> last_name_only;
+   retval = AsnWrite(aip, FIX_AUTHOR_CAPS_last_name_only,  &av);
+   if (! AsnCloseStruct(aip, atp, (Pointer)ptr)) {
+      goto erret;
+   }
+   retval = TRUE;
+
+erret:
+   AsnUnlinkType(orig);       /* unlink local tree */
+   return retval;
+}
+
+
+
+/**************************************************
+*
 *    FixCapsActionFree()
 *
 **************************************************/
@@ -17423,6 +17993,9 @@ FixCapsActionFree(ValNodePtr anp)
    case FixCapsAction_pub:
       FixPubCapsActionFree(anp -> data.ptrvalue);
       break;
+   case FixCapsAction_author:
+      FixAuthorCapsFree(anp -> data.ptrvalue);
+      break;
    }
    return MemFree(anp);
 }
@@ -17504,6 +18077,10 @@ FixCapsActionAsnRead(AsnIoPtr aip, AsnTypePtr orig)
       }
       anp->data.intvalue = av.intvalue;
    }
+   else if (atp == FIX_CAPS_ACTION_author) {
+      choice = FixCapsAction_author;
+      func = (AsnReadFunc) FixAuthorCapsAsnRead;
+   }
    anp->choice = choice;
    if (func != NULL)
    {
@@ -17581,6 +18158,10 @@ FixCapsActionAsnWrite(FixCapsActionPtr anp, AsnIoPtr aip, AsnTypePtr orig)
       av.intvalue = anp->data.intvalue;
       retval = AsnWrite(aip, FIX_CAPS_ACTION_src_qual, &av);
       break;
+   case FixCapsAction_author:
+      writetype = FIX_CAPS_ACTION_author;
+      func = (AsnWriteFunc) FixAuthorCapsAsnWrite;
+      break;
    }
    if (writetype != NULL) {
       retval = (* func)(pnt, aip, writetype);   /* write it out */
@@ -17672,7 +18253,7 @@ FixFormatActionAsnRead(AsnIoPtr aip, AsnTypePtr orig)
    if (atp == NULL) {
       goto erret;
    }
-   if (atp == FORMAT_ACTION_collection_date) {
+   if (atp == FIX_FORMAT_ACTION_collection_date) {
       choice = FixFormatAction_collection_date;
       if (AsnReadVal(aip, atp, &av) <= 0) {
          goto erret;
@@ -17763,7 +18344,7 @@ FixFormatActionAsnWrite(FixFormatActionPtr anp, AsnIoPtr aip, AsnTypePtr orig)
    {
    case FixFormatAction_collection_date:
       av.boolvalue = anp->data.boolvalue;
-      retval = AsnWrite(aip, FORMAT_ACTION_collection_date, &av);
+      retval = AsnWrite(aip, FIX_FORMAT_ACTION_collection_date, &av);
       break;
    case FixFormatAction_lat_lon:
       av.boolvalue = anp->data.boolvalue;
@@ -17873,35 +18454,35 @@ RemoveDuplicateFeatureActionAsnRead(AsnIoPtr aip, AsnTypePtr orig)
    atp = AsnReadId(aip,amp, atp);
    func = NULL;
 
-   if (atp == DUPLICATE_FEATURE_ACTION_type) {
+   if (atp == REMOVE_DUPLICATE_FEATURE_ACTION_type) {
       if ( AsnReadVal(aip, atp, &av) <= 0) {
          goto erret;
       }
       ptr -> type = av.intvalue;
       atp = AsnReadId(aip,amp, atp);
    }
-   if (atp == FEATURE_ACTION_ignore_partials) {
+   if (atp == REMOVE_DUPLICATE_FEATURE_ACTION_ignore_partials) {
       if ( AsnReadVal(aip, atp, &av) <= 0) {
          goto erret;
       }
       ptr -> ignore_partials = av.boolvalue;
       atp = AsnReadId(aip,amp, atp);
    }
-   if (atp == FEATURE_ACTION_case_sensitive) {
+   if (atp == REMOVE_DUPLICATE_FEATURE_ACTION_case_sensitive) {
       if ( AsnReadVal(aip, atp, &av) <= 0) {
          goto erret;
       }
       ptr -> case_sensitive = av.boolvalue;
       atp = AsnReadId(aip,amp, atp);
    }
-   if (atp == FEATURE_ACTION_remove_proteins) {
+   if (atp == REMOVE_DUPLICATE_FEATURE_ACTION_remove_proteins) {
       if ( AsnReadVal(aip, atp, &av) <= 0) {
          goto erret;
       }
       ptr -> remove_proteins = av.boolvalue;
       atp = AsnReadId(aip,amp, atp);
    }
-   if (atp == FEATURE_ACTION_rd_constraint) {
+   if (atp == REMOVE_DUPLICATE_FEATURE_ACTION_rd_constraint) {
       ptr -> rd_constraint = ConstraintChoiceSetAsnRead(aip, atp);
       if (aip -> io_failure) {
          goto erret;
@@ -17960,15 +18541,15 @@ RemoveDuplicateFeatureActionAsnWrite(RemoveDuplicateFeatureActionPtr ptr, AsnIoP
    }
 
    av.intvalue = ptr -> type;
-   retval = AsnWrite(aip, DUPLICATE_FEATURE_ACTION_type,  &av);
+   retval = AsnWrite(aip, REMOVE_DUPLICATE_FEATURE_ACTION_type,  &av);
    av.boolvalue = ptr -> ignore_partials;
-   retval = AsnWrite(aip, FEATURE_ACTION_ignore_partials,  &av);
+   retval = AsnWrite(aip, REMOVE_DUPLICATE_FEATURE_ACTION_ignore_partials,  &av);
    av.boolvalue = ptr -> case_sensitive;
-   retval = AsnWrite(aip, FEATURE_ACTION_case_sensitive,  &av);
+   retval = AsnWrite(aip, REMOVE_DUPLICATE_FEATURE_ACTION_case_sensitive,  &av);
    av.boolvalue = ptr -> remove_proteins;
-   retval = AsnWrite(aip, FEATURE_ACTION_remove_proteins,  &av);
+   retval = AsnWrite(aip, REMOVE_DUPLICATE_FEATURE_ACTION_remove_proteins,  &av);
    if (ptr -> rd_constraint != NULL) {
-      if ( ! ConstraintChoiceSetAsnWrite(ptr -> rd_constraint, aip, FEATURE_ACTION_rd_constraint)) {
+      if ( ! ConstraintChoiceSetAsnWrite(ptr -> rd_constraint, aip, REMOVE_DUPLICATE_FEATURE_ACTION_rd_constraint)) {
          goto erret;
       }
    }
@@ -18574,7 +19155,7 @@ MakeGeneXrefActionAsnRead(AsnIoPtr aip, AsnTypePtr orig)
       ptr -> feature = av.intvalue;
       atp = AsnReadId(aip,amp, atp);
    }
-   if (atp == GENE_XREF_ACTION_constraint) {
+   if (atp == MAKE_GENE_XREF_ACTION_constraint) {
       ptr -> constraint = ConstraintChoiceSetAsnRead(aip, atp);
       if (aip -> io_failure) {
          goto erret;
@@ -18635,7 +19216,7 @@ MakeGeneXrefActionAsnWrite(MakeGeneXrefActionPtr ptr, AsnIoPtr aip, AsnTypePtr o
    av.intvalue = ptr -> feature;
    retval = AsnWrite(aip, MAKE_GENE_XREF_ACTION_feature,  &av);
    if (ptr -> constraint != NULL) {
-      if ( ! ConstraintChoiceSetAsnWrite(ptr -> constraint, aip, GENE_XREF_ACTION_constraint)) {
+      if ( ! ConstraintChoiceSetAsnWrite(ptr -> constraint, aip, MAKE_GENE_XREF_ACTION_constraint)) {
          goto erret;
       }
    }
@@ -18818,6 +19399,2109 @@ erret:
 
 /**************************************************
 *
+*    UpdateSequencesActionNew()
+*
+**************************************************/
+NLM_EXTERN 
+UpdateSequencesActionPtr LIBCALL
+UpdateSequencesActionNew(void)
+{
+   UpdateSequencesActionPtr ptr = MemNew((size_t) sizeof(UpdateSequencesAction));
+
+   ptr -> add_cit_subs = 0;
+   return ptr;
+
+}
+
+
+/**************************************************
+*
+*    UpdateSequencesActionFree()
+*
+**************************************************/
+NLM_EXTERN 
+UpdateSequencesActionPtr LIBCALL
+UpdateSequencesActionFree(UpdateSequencesActionPtr ptr)
+{
+
+   if(ptr == NULL) {
+      return NULL;
+   }
+   MemFree(ptr -> filename);
+   return MemFree(ptr);
+}
+
+
+/**************************************************
+*
+*    UpdateSequencesActionAsnRead()
+*
+**************************************************/
+NLM_EXTERN 
+UpdateSequencesActionPtr LIBCALL
+UpdateSequencesActionAsnRead(AsnIoPtr aip, AsnTypePtr orig)
+{
+   DataVal av;
+   AsnTypePtr atp;
+   Boolean isError = FALSE;
+   AsnReadFunc func;
+   UpdateSequencesActionPtr ptr;
+
+   if (! loaded)
+   {
+      if (! objmacroAsnLoad()) {
+         return NULL;
+      }
+   }
+
+   if (aip == NULL) {
+      return NULL;
+   }
+
+   if (orig == NULL) {         /* UpdateSequencesAction ::= (self contained) */
+      atp = AsnReadId(aip, amp, UPDATE_SEQUENCES_ACTION);
+   } else {
+      atp = AsnLinkType(orig, UPDATE_SEQUENCES_ACTION);
+   }
+   /* link in local tree */
+   if (atp == NULL) {
+      return NULL;
+   }
+
+   ptr = UpdateSequencesActionNew();
+   if (ptr == NULL) {
+      goto erret;
+   }
+   if (AsnReadVal(aip, atp, &av) <= 0) { /* read the start struct */
+      goto erret;
+   }
+
+   atp = AsnReadId(aip,amp, atp);
+   func = NULL;
+
+   if (atp == UPDATE_SEQUENCES_ACTION_filename) {
+      if ( AsnReadVal(aip, atp, &av) <= 0) {
+         goto erret;
+      }
+      ptr -> filename = av.ptrvalue;
+      atp = AsnReadId(aip,amp, atp);
+   }
+   if (atp == UPDATE_SEQUENCES_ACTION_add_cit_subs) {
+      if ( AsnReadVal(aip, atp, &av) <= 0) {
+         goto erret;
+      }
+      ptr -> add_cit_subs = av.boolvalue;
+      atp = AsnReadId(aip,amp, atp);
+   }
+
+   if (AsnReadVal(aip, atp, &av) <= 0) {
+      goto erret;
+   }
+   /* end struct */
+
+ret:
+   AsnUnlinkType(orig);       /* unlink local tree */
+   return ptr;
+
+erret:
+   aip -> io_failure = TRUE;
+   ptr = UpdateSequencesActionFree(ptr);
+   goto ret;
+}
+
+
+
+/**************************************************
+*
+*    UpdateSequencesActionAsnWrite()
+*
+**************************************************/
+NLM_EXTERN Boolean LIBCALL 
+UpdateSequencesActionAsnWrite(UpdateSequencesActionPtr ptr, AsnIoPtr aip, AsnTypePtr orig)
+{
+   DataVal av;
+   AsnTypePtr atp;
+   Boolean retval = FALSE;
+
+   if (! loaded)
+   {
+      if (! objmacroAsnLoad()) {
+         return FALSE;
+      }
+   }
+
+   if (aip == NULL) {
+      return FALSE;
+   }
+
+   atp = AsnLinkType(orig, UPDATE_SEQUENCES_ACTION);   /* link local tree */
+   if (atp == NULL) {
+      return FALSE;
+   }
+
+   if (ptr == NULL) { AsnNullValueMsg(aip, atp); goto erret; }
+   if (! AsnOpenStruct(aip, atp, (Pointer) ptr)) {
+      goto erret;
+   }
+
+   if (ptr -> filename != NULL) {
+      av.ptrvalue = ptr -> filename;
+      retval = AsnWrite(aip, UPDATE_SEQUENCES_ACTION_filename,  &av);
+   }
+   av.boolvalue = ptr -> add_cit_subs;
+   retval = AsnWrite(aip, UPDATE_SEQUENCES_ACTION_add_cit_subs,  &av);
+   if (! AsnCloseStruct(aip, atp, (Pointer)ptr)) {
+      goto erret;
+   }
+   retval = TRUE;
+
+erret:
+   AsnUnlinkType(orig);       /* unlink local tree */
+   return retval;
+}
+
+
+
+/**************************************************
+*
+*    CreateTSAIdsSrcFree()
+*
+**************************************************/
+NLM_EXTERN 
+CreateTSAIdsSrcPtr LIBCALL
+CreateTSAIdsSrcFree(ValNodePtr anp)
+{
+   Pointer pnt;
+
+   if (anp == NULL) {
+      return NULL;
+   }
+
+   pnt = anp->data.ptrvalue;
+   switch (anp->choice)
+   {
+   default:
+      break;
+   case CreateTSAIdsSrc_defline:
+      TextPortionFree(anp -> data.ptrvalue);
+      break;
+   }
+   return MemFree(anp);
+}
+
+
+/**************************************************
+*
+*    CreateTSAIdsSrcAsnRead()
+*
+**************************************************/
+NLM_EXTERN 
+CreateTSAIdsSrcPtr LIBCALL
+CreateTSAIdsSrcAsnRead(AsnIoPtr aip, AsnTypePtr orig)
+{
+   DataVal av;
+   AsnTypePtr atp;
+   ValNodePtr anp;
+   Uint1 choice;
+   Boolean isError = FALSE;
+   Boolean nullIsError = FALSE;
+   AsnReadFunc func;
+
+   if (! loaded)
+   {
+      if (! objmacroAsnLoad()) {
+         return NULL;
+      }
+   }
+
+   if (aip == NULL) {
+      return NULL;
+   }
+
+   if (orig == NULL) {         /* CreateTSAIdsSrc ::= (self contained) */
+      atp = AsnReadId(aip, amp, CREATE_TSA_IDS_SRC);
+   } else {
+      atp = AsnLinkType(orig, CREATE_TSA_IDS_SRC);    /* link in local tree */
+   }
+   if (atp == NULL) {
+      return NULL;
+   }
+
+   anp = ValNodeNew(NULL);
+   if (anp == NULL) {
+      goto erret;
+   }
+   if (AsnReadVal(aip, atp, &av) <= 0) { /* read the CHOICE or OpenStruct value (nothing) */
+      goto erret;
+   }
+
+   func = NULL;
+
+   atp = AsnReadId(aip, amp, atp);  /* find the choice */
+   if (atp == NULL) {
+      goto erret;
+   }
+   if (atp == CREATE_TSA_IDS_SRC_local_id) {
+      choice = CreateTSAIdsSrc_local_id;
+      if (AsnReadVal(aip, atp, &av) <= 0) {
+         goto erret;
+      }
+      anp->data.boolvalue = av.boolvalue;
+   }
+   else if (atp == CREATE_TSA_IDS_SRC_defline) {
+      choice = CreateTSAIdsSrc_defline;
+      func = (AsnReadFunc) TextPortionAsnRead;
+   }
+   anp->choice = choice;
+   if (func != NULL)
+   {
+      anp->data.ptrvalue = (* func)(aip, atp);
+      if (aip -> io_failure) goto erret;
+
+      if (nullIsError && anp->data.ptrvalue == NULL) {
+         goto erret;
+      }
+   }
+
+ret:
+   AsnUnlinkType(orig);       /* unlink local tree */
+   return anp;
+
+erret:
+   anp = MemFree(anp);
+   aip -> io_failure = TRUE;
+   goto ret;
+}
+
+
+/**************************************************
+*
+*    CreateTSAIdsSrcAsnWrite()
+*
+**************************************************/
+NLM_EXTERN Boolean LIBCALL 
+CreateTSAIdsSrcAsnWrite(CreateTSAIdsSrcPtr anp, AsnIoPtr aip, AsnTypePtr orig)
+
+{
+   DataVal av;
+   AsnTypePtr atp, writetype = NULL;
+   Pointer pnt;
+   AsnWriteFunc func = NULL;
+   Boolean retval = FALSE;
+
+   if (! loaded)
+   {
+      if (! objmacroAsnLoad())
+      return FALSE;
+   }
+
+   if (aip == NULL)
+   return FALSE;
+
+   atp = AsnLinkType(orig, CREATE_TSA_IDS_SRC);   /* link local tree */
+   if (atp == NULL) {
+      return FALSE;
+   }
+
+   if (anp == NULL) { AsnNullValueMsg(aip, atp); goto erret; }
+
+   av.ptrvalue = (Pointer)anp;
+   if (! AsnWriteChoice(aip, atp, (Int2)anp->choice, &av)) {
+      goto erret;
+   }
+
+   pnt = anp->data.ptrvalue;
+   switch (anp->choice)
+   {
+   case CreateTSAIdsSrc_local_id:
+      av.boolvalue = anp->data.boolvalue;
+      retval = AsnWrite(aip, CREATE_TSA_IDS_SRC_local_id, &av);
+      break;
+   case CreateTSAIdsSrc_defline:
+      writetype = CREATE_TSA_IDS_SRC_defline;
+      func = (AsnWriteFunc) TextPortionAsnWrite;
+      break;
+   }
+   if (writetype != NULL) {
+      retval = (* func)(pnt, aip, writetype);   /* write it out */
+   }
+   if (!retval) {
+      goto erret;
+   }
+   retval = TRUE;
+
+erret:
+   AsnUnlinkType(orig);       /* unlink local tree */
+   return retval;
+}
+
+
+/**************************************************
+*
+*    CreateTSAIdsActionNew()
+*
+**************************************************/
+NLM_EXTERN 
+CreateTSAIdsActionPtr LIBCALL
+CreateTSAIdsActionNew(void)
+{
+   CreateTSAIdsActionPtr ptr = MemNew((size_t) sizeof(CreateTSAIdsAction));
+
+   return ptr;
+
+}
+
+
+/**************************************************
+*
+*    CreateTSAIdsActionFree()
+*
+**************************************************/
+NLM_EXTERN 
+CreateTSAIdsActionPtr LIBCALL
+CreateTSAIdsActionFree(CreateTSAIdsActionPtr ptr)
+{
+
+   if(ptr == NULL) {
+      return NULL;
+   }
+   CreateTSAIdsSrcFree(ptr -> src);
+   MemFree(ptr -> suffix);
+   TextPortionFree(ptr -> id_text_portion);
+   return MemFree(ptr);
+}
+
+
+/**************************************************
+*
+*    CreateTSAIdsActionAsnRead()
+*
+**************************************************/
+NLM_EXTERN 
+CreateTSAIdsActionPtr LIBCALL
+CreateTSAIdsActionAsnRead(AsnIoPtr aip, AsnTypePtr orig)
+{
+   DataVal av;
+   AsnTypePtr atp;
+   Boolean isError = FALSE;
+   AsnReadFunc func;
+   CreateTSAIdsActionPtr ptr;
+
+   if (! loaded)
+   {
+      if (! objmacroAsnLoad()) {
+         return NULL;
+      }
+   }
+
+   if (aip == NULL) {
+      return NULL;
+   }
+
+   if (orig == NULL) {         /* CreateTSAIdsAction ::= (self contained) */
+      atp = AsnReadId(aip, amp, CREATE_TSA_IDS_ACTION);
+   } else {
+      atp = AsnLinkType(orig, CREATE_TSA_IDS_ACTION);
+   }
+   /* link in local tree */
+   if (atp == NULL) {
+      return NULL;
+   }
+
+   ptr = CreateTSAIdsActionNew();
+   if (ptr == NULL) {
+      goto erret;
+   }
+   if (AsnReadVal(aip, atp, &av) <= 0) { /* read the start struct */
+      goto erret;
+   }
+
+   atp = AsnReadId(aip,amp, atp);
+   func = NULL;
+
+   if (atp == CREATE_TSA_IDS_ACTION_src) {
+      ptr -> src = CreateTSAIdsSrcAsnRead(aip, atp);
+      if (aip -> io_failure) {
+         goto erret;
+      }
+      atp = AsnReadId(aip,amp, atp);
+   }
+   if (atp == CREATE_TSA_IDS_ACTION_suffix) {
+      if ( AsnReadVal(aip, atp, &av) <= 0) {
+         goto erret;
+      }
+      ptr -> suffix = av.ptrvalue;
+      atp = AsnReadId(aip,amp, atp);
+   }
+   if (atp == CREATE_TSA_IDS_ACTION_id_text_portion) {
+      ptr -> id_text_portion = TextPortionAsnRead(aip, atp);
+      if (aip -> io_failure) {
+         goto erret;
+      }
+      atp = AsnReadId(aip,amp, atp);
+   }
+
+   if (AsnReadVal(aip, atp, &av) <= 0) {
+      goto erret;
+   }
+   /* end struct */
+
+ret:
+   AsnUnlinkType(orig);       /* unlink local tree */
+   return ptr;
+
+erret:
+   aip -> io_failure = TRUE;
+   ptr = CreateTSAIdsActionFree(ptr);
+   goto ret;
+}
+
+
+
+/**************************************************
+*
+*    CreateTSAIdsActionAsnWrite()
+*
+**************************************************/
+NLM_EXTERN Boolean LIBCALL 
+CreateTSAIdsActionAsnWrite(CreateTSAIdsActionPtr ptr, AsnIoPtr aip, AsnTypePtr orig)
+{
+   DataVal av;
+   AsnTypePtr atp;
+   Boolean retval = FALSE;
+
+   if (! loaded)
+   {
+      if (! objmacroAsnLoad()) {
+         return FALSE;
+      }
+   }
+
+   if (aip == NULL) {
+      return FALSE;
+   }
+
+   atp = AsnLinkType(orig, CREATE_TSA_IDS_ACTION);   /* link local tree */
+   if (atp == NULL) {
+      return FALSE;
+   }
+
+   if (ptr == NULL) { AsnNullValueMsg(aip, atp); goto erret; }
+   if (! AsnOpenStruct(aip, atp, (Pointer) ptr)) {
+      goto erret;
+   }
+
+   if (ptr -> src != NULL) {
+      if ( ! CreateTSAIdsSrcAsnWrite(ptr -> src, aip, CREATE_TSA_IDS_ACTION_src)) {
+         goto erret;
+      }
+   }
+   if (ptr -> suffix != NULL) {
+      av.ptrvalue = ptr -> suffix;
+      retval = AsnWrite(aip, CREATE_TSA_IDS_ACTION_suffix,  &av);
+   }
+   if (ptr -> id_text_portion != NULL) {
+      if ( ! TextPortionAsnWrite(ptr -> id_text_portion, aip, CREATE_TSA_IDS_ACTION_id_text_portion)) {
+         goto erret;
+      }
+   }
+   if (! AsnCloseStruct(aip, atp, (Pointer)ptr)) {
+      goto erret;
+   }
+   retval = TRUE;
+
+erret:
+   AsnUnlinkType(orig);       /* unlink local tree */
+   return retval;
+}
+
+
+
+/**************************************************
+*
+*    AutofixActionNew()
+*
+**************************************************/
+NLM_EXTERN 
+AutofixActionPtr LIBCALL
+AutofixActionNew(void)
+{
+   AutofixActionPtr ptr = MemNew((size_t) sizeof(AutofixAction));
+
+   return ptr;
+
+}
+
+
+/**************************************************
+*
+*    AutofixActionFree()
+*
+**************************************************/
+NLM_EXTERN 
+AutofixActionPtr LIBCALL
+AutofixActionFree(AutofixActionPtr ptr)
+{
+
+   if(ptr == NULL) {
+      return NULL;
+   }
+   MemFree(ptr -> test_name);
+   return MemFree(ptr);
+}
+
+
+/**************************************************
+*
+*    AutofixActionAsnRead()
+*
+**************************************************/
+NLM_EXTERN 
+AutofixActionPtr LIBCALL
+AutofixActionAsnRead(AsnIoPtr aip, AsnTypePtr orig)
+{
+   DataVal av;
+   AsnTypePtr atp;
+   Boolean isError = FALSE;
+   AsnReadFunc func;
+   AutofixActionPtr ptr;
+
+   if (! loaded)
+   {
+      if (! objmacroAsnLoad()) {
+         return NULL;
+      }
+   }
+
+   if (aip == NULL) {
+      return NULL;
+   }
+
+   if (orig == NULL) {         /* AutofixAction ::= (self contained) */
+      atp = AsnReadId(aip, amp, AUTOFIX_ACTION);
+   } else {
+      atp = AsnLinkType(orig, AUTOFIX_ACTION);
+   }
+   /* link in local tree */
+   if (atp == NULL) {
+      return NULL;
+   }
+
+   ptr = AutofixActionNew();
+   if (ptr == NULL) {
+      goto erret;
+   }
+   if (AsnReadVal(aip, atp, &av) <= 0) { /* read the start struct */
+      goto erret;
+   }
+
+   atp = AsnReadId(aip,amp, atp);
+   func = NULL;
+
+   if (atp == AUTOFIX_ACTION_test_name) {
+      if ( AsnReadVal(aip, atp, &av) <= 0) {
+         goto erret;
+      }
+      ptr -> test_name = av.ptrvalue;
+      atp = AsnReadId(aip,amp, atp);
+   }
+
+   if (AsnReadVal(aip, atp, &av) <= 0) {
+      goto erret;
+   }
+   /* end struct */
+
+ret:
+   AsnUnlinkType(orig);       /* unlink local tree */
+   return ptr;
+
+erret:
+   aip -> io_failure = TRUE;
+   ptr = AutofixActionFree(ptr);
+   goto ret;
+}
+
+
+
+/**************************************************
+*
+*    AutofixActionAsnWrite()
+*
+**************************************************/
+NLM_EXTERN Boolean LIBCALL 
+AutofixActionAsnWrite(AutofixActionPtr ptr, AsnIoPtr aip, AsnTypePtr orig)
+{
+   DataVal av;
+   AsnTypePtr atp;
+   Boolean retval = FALSE;
+
+   if (! loaded)
+   {
+      if (! objmacroAsnLoad()) {
+         return FALSE;
+      }
+   }
+
+   if (aip == NULL) {
+      return FALSE;
+   }
+
+   atp = AsnLinkType(orig, AUTOFIX_ACTION);   /* link local tree */
+   if (atp == NULL) {
+      return FALSE;
+   }
+
+   if (ptr == NULL) { AsnNullValueMsg(aip, atp); goto erret; }
+   if (! AsnOpenStruct(aip, atp, (Pointer) ptr)) {
+      goto erret;
+   }
+
+   if (ptr -> test_name != NULL) {
+      av.ptrvalue = ptr -> test_name;
+      retval = AsnWrite(aip, AUTOFIX_ACTION_test_name,  &av);
+   }
+   if (! AsnCloseStruct(aip, atp, (Pointer)ptr)) {
+      goto erret;
+   }
+   retval = TRUE;
+
+erret:
+   AsnUnlinkType(orig);       /* unlink local tree */
+   return retval;
+}
+
+
+
+/**************************************************
+*
+*    FixSetsActionFree()
+*
+**************************************************/
+NLM_EXTERN 
+FixSetsActionPtr LIBCALL
+FixSetsActionFree(ValNodePtr anp)
+{
+   Pointer pnt;
+
+   if (anp == NULL) {
+      return NULL;
+   }
+
+   pnt = anp->data.ptrvalue;
+   switch (anp->choice)
+   {
+   default:
+      break;
+   }
+   return MemFree(anp);
+}
+
+
+/**************************************************
+*
+*    FixSetsActionAsnRead()
+*
+**************************************************/
+NLM_EXTERN 
+FixSetsActionPtr LIBCALL
+FixSetsActionAsnRead(AsnIoPtr aip, AsnTypePtr orig)
+{
+   DataVal av;
+   AsnTypePtr atp;
+   ValNodePtr anp;
+   Uint1 choice;
+   Boolean isError = FALSE;
+   Boolean nullIsError = FALSE;
+   AsnReadFunc func;
+
+   if (! loaded)
+   {
+      if (! objmacroAsnLoad()) {
+         return NULL;
+      }
+   }
+
+   if (aip == NULL) {
+      return NULL;
+   }
+
+   if (orig == NULL) {         /* FixSetsAction ::= (self contained) */
+      atp = AsnReadId(aip, amp, FIX_SETS_ACTION);
+   } else {
+      atp = AsnLinkType(orig, FIX_SETS_ACTION);    /* link in local tree */
+   }
+   if (atp == NULL) {
+      return NULL;
+   }
+
+   anp = ValNodeNew(NULL);
+   if (anp == NULL) {
+      goto erret;
+   }
+   if (AsnReadVal(aip, atp, &av) <= 0) { /* read the CHOICE or OpenStruct value (nothing) */
+      goto erret;
+   }
+
+   func = NULL;
+
+   atp = AsnReadId(aip, amp, atp);  /* find the choice */
+   if (atp == NULL) {
+      goto erret;
+   }
+   if (atp == FIX_SETS_ACTION_remove_single_item_set) {
+      choice = FixSetsAction_remove_single_item_set;
+      if (AsnReadVal(aip, atp, &av) <= 0) {
+         goto erret;
+      }
+      anp->data.boolvalue = av.boolvalue;
+   }
+   else if (atp == FIX_SETS_ACTION_renormalize_nuc_prot_sets) {
+      choice = FixSetsAction_renormalize_nuc_prot_sets;
+      if (AsnReadVal(aip, atp, &av) <= 0) {
+         goto erret;
+      }
+      anp->data.boolvalue = av.boolvalue;
+   }
+   else if (atp == FIX_SETS_ACTION_fix_pop_to_phy) {
+      choice = FixSetsAction_fix_pop_to_phy;
+      if (AsnReadVal(aip, atp, &av) <= 0) {
+         goto erret;
+      }
+      anp->data.boolvalue = av.boolvalue;
+   }
+   anp->choice = choice;
+   if (func != NULL)
+   {
+      anp->data.ptrvalue = (* func)(aip, atp);
+      if (aip -> io_failure) goto erret;
+
+      if (nullIsError && anp->data.ptrvalue == NULL) {
+         goto erret;
+      }
+   }
+
+ret:
+   AsnUnlinkType(orig);       /* unlink local tree */
+   return anp;
+
+erret:
+   anp = MemFree(anp);
+   aip -> io_failure = TRUE;
+   goto ret;
+}
+
+
+/**************************************************
+*
+*    FixSetsActionAsnWrite()
+*
+**************************************************/
+NLM_EXTERN Boolean LIBCALL 
+FixSetsActionAsnWrite(FixSetsActionPtr anp, AsnIoPtr aip, AsnTypePtr orig)
+
+{
+   DataVal av;
+   AsnTypePtr atp, writetype = NULL;
+   Pointer pnt;
+   AsnWriteFunc func = NULL;
+   Boolean retval = FALSE;
+
+   if (! loaded)
+   {
+      if (! objmacroAsnLoad())
+      return FALSE;
+   }
+
+   if (aip == NULL)
+   return FALSE;
+
+   atp = AsnLinkType(orig, FIX_SETS_ACTION);   /* link local tree */
+   if (atp == NULL) {
+      return FALSE;
+   }
+
+   if (anp == NULL) { AsnNullValueMsg(aip, atp); goto erret; }
+
+   av.ptrvalue = (Pointer)anp;
+   if (! AsnWriteChoice(aip, atp, (Int2)anp->choice, &av)) {
+      goto erret;
+   }
+
+   pnt = anp->data.ptrvalue;
+   switch (anp->choice)
+   {
+   case FixSetsAction_remove_single_item_set:
+      av.boolvalue = anp->data.boolvalue;
+      retval = AsnWrite(aip, FIX_SETS_ACTION_remove_single_item_set, &av);
+      break;
+   case FixSetsAction_renormalize_nuc_prot_sets:
+      av.boolvalue = anp->data.boolvalue;
+      retval = AsnWrite(aip, FIX_SETS_ACTION_renormalize_nuc_prot_sets, &av);
+      break;
+   case FixSetsAction_fix_pop_to_phy:
+      av.boolvalue = anp->data.boolvalue;
+      retval = AsnWrite(aip, FIX_SETS_ACTION_fix_pop_to_phy, &av);
+      break;
+   }
+   if (writetype != NULL) {
+      retval = (* func)(pnt, aip, writetype);   /* write it out */
+   }
+   if (!retval) {
+      goto erret;
+   }
+   retval = TRUE;
+
+erret:
+   AsnUnlinkType(orig);       /* unlink local tree */
+   return retval;
+}
+
+
+/**************************************************
+*
+*    TableMatchTypeFree()
+*
+**************************************************/
+NLM_EXTERN 
+TableMatchTypePtr LIBCALL
+TableMatchTypeFree(ValNodePtr anp)
+{
+   Pointer pnt;
+
+   if (anp == NULL) {
+      return NULL;
+   }
+
+   pnt = anp->data.ptrvalue;
+   switch (anp->choice)
+   {
+   default:
+      break;
+   case TableMatchType_src_qual:
+      SourceQualChoiceFree(anp -> data.ptrvalue);
+      break;
+   }
+   return MemFree(anp);
+}
+
+
+/**************************************************
+*
+*    TableMatchTypeAsnRead()
+*
+**************************************************/
+NLM_EXTERN 
+TableMatchTypePtr LIBCALL
+TableMatchTypeAsnRead(AsnIoPtr aip, AsnTypePtr orig)
+{
+   DataVal av;
+   AsnTypePtr atp;
+   ValNodePtr anp;
+   Uint1 choice;
+   Boolean isError = FALSE;
+   Boolean nullIsError = FALSE;
+   AsnReadFunc func;
+
+   if (! loaded)
+   {
+      if (! objmacroAsnLoad()) {
+         return NULL;
+      }
+   }
+
+   if (aip == NULL) {
+      return NULL;
+   }
+
+   if (orig == NULL) {         /* TableMatchType ::= (self contained) */
+      atp = AsnReadId(aip, amp, TABLE_MATCH_TYPE);
+   } else {
+      atp = AsnLinkType(orig, TABLE_MATCH_TYPE);    /* link in local tree */
+   }
+   if (atp == NULL) {
+      return NULL;
+   }
+
+   anp = ValNodeNew(NULL);
+   if (anp == NULL) {
+      goto erret;
+   }
+   if (AsnReadVal(aip, atp, &av) <= 0) { /* read the CHOICE or OpenStruct value (nothing) */
+      goto erret;
+   }
+
+   func = NULL;
+
+   atp = AsnReadId(aip, amp, atp);  /* find the choice */
+   if (atp == NULL) {
+      goto erret;
+   }
+   if (atp == TABLE_MATCH_TYPE_feature_id) {
+      choice = TableMatchType_feature_id;
+      if (AsnReadVal(aip, atp, &av) <= 0) {
+         goto erret;
+      }
+      anp->data.boolvalue = av.boolvalue;
+   }
+   else if (atp == TABLE_MATCH_TYPE_gene_locus_tag) {
+      choice = TableMatchType_gene_locus_tag;
+      if (AsnReadVal(aip, atp, &av) <= 0) {
+         goto erret;
+      }
+      anp->data.boolvalue = av.boolvalue;
+   }
+   else if (atp == TABLE_MATCH_TYPE_protein_id) {
+      choice = TableMatchType_protein_id;
+      if (AsnReadVal(aip, atp, &av) <= 0) {
+         goto erret;
+      }
+      anp->data.boolvalue = av.boolvalue;
+   }
+   else if (atp == TABLE_MATCH_TYPE_dbxref) {
+      choice = TableMatchType_dbxref;
+      if (AsnReadVal(aip, atp, &av) <= 0) {
+         goto erret;
+      }
+      anp->data.boolvalue = av.boolvalue;
+   }
+   else if (atp == TABLE_MATCH_TYPE_nuc_id) {
+      choice = TableMatchType_nuc_id;
+      if (AsnReadVal(aip, atp, &av) <= 0) {
+         goto erret;
+      }
+      anp->data.boolvalue = av.boolvalue;
+   }
+   else if (atp == TABLE_MATCH_TYPE_src_qual) {
+      choice = TableMatchType_src_qual;
+      func = (AsnReadFunc) SourceQualChoiceAsnRead;
+   }
+   else if (atp == TABLE_MATCH_TYPE_protein_name) {
+      choice = TableMatchType_protein_name;
+      if (AsnReadVal(aip, atp, &av) <= 0) {
+         goto erret;
+      }
+      anp->data.boolvalue = av.boolvalue;
+   }
+   else if (atp == TABLE_MATCH_TYPE_any) {
+      choice = TableMatchType_any;
+      if (AsnReadVal(aip, atp, &av) <= 0) {
+         goto erret;
+      }
+      anp->data.boolvalue = av.boolvalue;
+   }
+   anp->choice = choice;
+   if (func != NULL)
+   {
+      anp->data.ptrvalue = (* func)(aip, atp);
+      if (aip -> io_failure) goto erret;
+
+      if (nullIsError && anp->data.ptrvalue == NULL) {
+         goto erret;
+      }
+   }
+
+ret:
+   AsnUnlinkType(orig);       /* unlink local tree */
+   return anp;
+
+erret:
+   anp = MemFree(anp);
+   aip -> io_failure = TRUE;
+   goto ret;
+}
+
+
+/**************************************************
+*
+*    TableMatchTypeAsnWrite()
+*
+**************************************************/
+NLM_EXTERN Boolean LIBCALL 
+TableMatchTypeAsnWrite(TableMatchTypePtr anp, AsnIoPtr aip, AsnTypePtr orig)
+
+{
+   DataVal av;
+   AsnTypePtr atp, writetype = NULL;
+   Pointer pnt;
+   AsnWriteFunc func = NULL;
+   Boolean retval = FALSE;
+
+   if (! loaded)
+   {
+      if (! objmacroAsnLoad())
+      return FALSE;
+   }
+
+   if (aip == NULL)
+   return FALSE;
+
+   atp = AsnLinkType(orig, TABLE_MATCH_TYPE);   /* link local tree */
+   if (atp == NULL) {
+      return FALSE;
+   }
+
+   if (anp == NULL) { AsnNullValueMsg(aip, atp); goto erret; }
+
+   av.ptrvalue = (Pointer)anp;
+   if (! AsnWriteChoice(aip, atp, (Int2)anp->choice, &av)) {
+      goto erret;
+   }
+
+   pnt = anp->data.ptrvalue;
+   switch (anp->choice)
+   {
+   case TableMatchType_feature_id:
+      av.boolvalue = anp->data.boolvalue;
+      retval = AsnWrite(aip, TABLE_MATCH_TYPE_feature_id, &av);
+      break;
+   case TableMatchType_gene_locus_tag:
+      av.boolvalue = anp->data.boolvalue;
+      retval = AsnWrite(aip, TABLE_MATCH_TYPE_gene_locus_tag, &av);
+      break;
+   case TableMatchType_protein_id:
+      av.boolvalue = anp->data.boolvalue;
+      retval = AsnWrite(aip, TABLE_MATCH_TYPE_protein_id, &av);
+      break;
+   case TableMatchType_dbxref:
+      av.boolvalue = anp->data.boolvalue;
+      retval = AsnWrite(aip, TABLE_MATCH_TYPE_dbxref, &av);
+      break;
+   case TableMatchType_nuc_id:
+      av.boolvalue = anp->data.boolvalue;
+      retval = AsnWrite(aip, TABLE_MATCH_TYPE_nuc_id, &av);
+      break;
+   case TableMatchType_src_qual:
+      writetype = TABLE_MATCH_TYPE_src_qual;
+      func = (AsnWriteFunc) SourceQualChoiceAsnWrite;
+      break;
+   case TableMatchType_protein_name:
+      av.boolvalue = anp->data.boolvalue;
+      retval = AsnWrite(aip, TABLE_MATCH_TYPE_protein_name, &av);
+      break;
+   case TableMatchType_any:
+      av.boolvalue = anp->data.boolvalue;
+      retval = AsnWrite(aip, TABLE_MATCH_TYPE_any, &av);
+      break;
+   }
+   if (writetype != NULL) {
+      retval = (* func)(pnt, aip, writetype);   /* write it out */
+   }
+   if (!retval) {
+      goto erret;
+   }
+   retval = TRUE;
+
+erret:
+   AsnUnlinkType(orig);       /* unlink local tree */
+   return retval;
+}
+
+
+/**************************************************
+*
+*    TableMatchNew()
+*
+**************************************************/
+NLM_EXTERN 
+TableMatchPtr LIBCALL
+TableMatchNew(void)
+{
+   TableMatchPtr ptr = MemNew((size_t) sizeof(TableMatch));
+
+   ptr -> match_location = 2;
+   return ptr;
+
+}
+
+
+/**************************************************
+*
+*    TableMatchFree()
+*
+**************************************************/
+NLM_EXTERN 
+TableMatchPtr LIBCALL
+TableMatchFree(TableMatchPtr ptr)
+{
+
+   if(ptr == NULL) {
+      return NULL;
+   }
+   TableMatchTypeFree(ptr -> match_type);
+   return MemFree(ptr);
+}
+
+
+/**************************************************
+*
+*    TableMatchAsnRead()
+*
+**************************************************/
+NLM_EXTERN 
+TableMatchPtr LIBCALL
+TableMatchAsnRead(AsnIoPtr aip, AsnTypePtr orig)
+{
+   DataVal av;
+   AsnTypePtr atp;
+   Boolean isError = FALSE;
+   AsnReadFunc func;
+   TableMatchPtr ptr;
+
+   if (! loaded)
+   {
+      if (! objmacroAsnLoad()) {
+         return NULL;
+      }
+   }
+
+   if (aip == NULL) {
+      return NULL;
+   }
+
+   if (orig == NULL) {         /* TableMatch ::= (self contained) */
+      atp = AsnReadId(aip, amp, TABLE_MATCH);
+   } else {
+      atp = AsnLinkType(orig, TABLE_MATCH);
+   }
+   /* link in local tree */
+   if (atp == NULL) {
+      return NULL;
+   }
+
+   ptr = TableMatchNew();
+   if (ptr == NULL) {
+      goto erret;
+   }
+   if (AsnReadVal(aip, atp, &av) <= 0) { /* read the start struct */
+      goto erret;
+   }
+
+   atp = AsnReadId(aip,amp, atp);
+   func = NULL;
+
+   if (atp == TABLE_MATCH_match_type) {
+      ptr -> match_type = TableMatchTypeAsnRead(aip, atp);
+      if (aip -> io_failure) {
+         goto erret;
+      }
+      atp = AsnReadId(aip,amp, atp);
+   }
+   if (atp == TABLE_MATCH_match_location) {
+      if ( AsnReadVal(aip, atp, &av) <= 0) {
+         goto erret;
+      }
+      ptr -> match_location = av.intvalue;
+      atp = AsnReadId(aip,amp, atp);
+   }
+
+   if (AsnReadVal(aip, atp, &av) <= 0) {
+      goto erret;
+   }
+   /* end struct */
+
+ret:
+   AsnUnlinkType(orig);       /* unlink local tree */
+   return ptr;
+
+erret:
+   aip -> io_failure = TRUE;
+   ptr = TableMatchFree(ptr);
+   goto ret;
+}
+
+
+
+/**************************************************
+*
+*    TableMatchAsnWrite()
+*
+**************************************************/
+NLM_EXTERN Boolean LIBCALL 
+TableMatchAsnWrite(TableMatchPtr ptr, AsnIoPtr aip, AsnTypePtr orig)
+{
+   DataVal av;
+   AsnTypePtr atp;
+   Boolean retval = FALSE;
+
+   if (! loaded)
+   {
+      if (! objmacroAsnLoad()) {
+         return FALSE;
+      }
+   }
+
+   if (aip == NULL) {
+      return FALSE;
+   }
+
+   atp = AsnLinkType(orig, TABLE_MATCH);   /* link local tree */
+   if (atp == NULL) {
+      return FALSE;
+   }
+
+   if (ptr == NULL) { AsnNullValueMsg(aip, atp); goto erret; }
+   if (! AsnOpenStruct(aip, atp, (Pointer) ptr)) {
+      goto erret;
+   }
+
+   if (ptr -> match_type != NULL) {
+      if ( ! TableMatchTypeAsnWrite(ptr -> match_type, aip, TABLE_MATCH_match_type)) {
+         goto erret;
+      }
+   }
+   av.intvalue = ptr -> match_location;
+   retval = AsnWrite(aip, TABLE_MATCH_match_location,  &av);
+   if (! AsnCloseStruct(aip, atp, (Pointer)ptr)) {
+      goto erret;
+   }
+   retval = TRUE;
+
+erret:
+   AsnUnlinkType(orig);       /* unlink local tree */
+   return retval;
+}
+
+
+
+/**************************************************
+*
+*    ApplyTableExtraDataFree()
+*
+**************************************************/
+NLM_EXTERN 
+ApplyTableExtraDataPtr LIBCALL
+ApplyTableExtraDataFree(ValNodePtr anp)
+{
+   Pointer pnt;
+
+   if (anp == NULL) {
+      return NULL;
+   }
+
+   pnt = anp->data.ptrvalue;
+   switch (anp->choice)
+   {
+   default:
+      break;
+   }
+   return MemFree(anp);
+}
+
+
+/**************************************************
+*
+*    ApplyTableExtraDataAsnRead()
+*
+**************************************************/
+NLM_EXTERN 
+ApplyTableExtraDataPtr LIBCALL
+ApplyTableExtraDataAsnRead(AsnIoPtr aip, AsnTypePtr orig)
+{
+   DataVal av;
+   AsnTypePtr atp;
+   ValNodePtr anp;
+   Uint1 choice;
+   Boolean isError = FALSE;
+   Boolean nullIsError = FALSE;
+   AsnReadFunc func;
+
+   if (! loaded)
+   {
+      if (! objmacroAsnLoad()) {
+         return NULL;
+      }
+   }
+
+   if (aip == NULL) {
+      return NULL;
+   }
+
+   if (orig == NULL) {         /* ApplyTableExtraData ::= (self contained) */
+      atp = AsnReadId(aip, amp, APPLY_TABLE_EXTRA_DATA);
+   } else {
+      atp = AsnLinkType(orig, APPLY_TABLE_EXTRA_DATA);    /* link in local tree */
+   }
+   if (atp == NULL) {
+      return NULL;
+   }
+
+   anp = ValNodeNew(NULL);
+   if (anp == NULL) {
+      goto erret;
+   }
+   if (AsnReadVal(aip, atp, &av) <= 0) { /* read the CHOICE or OpenStruct value (nothing) */
+      goto erret;
+   }
+
+   func = NULL;
+
+   atp = AsnReadId(aip, amp, atp);  /* find the choice */
+   if (atp == NULL) {
+      goto erret;
+   }
+   if (atp == APPLY_TABLE_EXTRA_DATA_table) {
+      choice = ApplyTableExtraData_table;
+      if (AsnReadVal(aip, atp, &av) <= 0) {
+         goto erret;
+      }
+      anp->data.boolvalue = av.boolvalue;
+   }
+   anp->choice = choice;
+   if (func != NULL)
+   {
+      anp->data.ptrvalue = (* func)(aip, atp);
+      if (aip -> io_failure) goto erret;
+
+      if (nullIsError && anp->data.ptrvalue == NULL) {
+         goto erret;
+      }
+   }
+
+ret:
+   AsnUnlinkType(orig);       /* unlink local tree */
+   return anp;
+
+erret:
+   anp = MemFree(anp);
+   aip -> io_failure = TRUE;
+   goto ret;
+}
+
+
+/**************************************************
+*
+*    ApplyTableExtraDataAsnWrite()
+*
+**************************************************/
+NLM_EXTERN Boolean LIBCALL 
+ApplyTableExtraDataAsnWrite(ApplyTableExtraDataPtr anp, AsnIoPtr aip, AsnTypePtr orig)
+
+{
+   DataVal av;
+   AsnTypePtr atp, writetype = NULL;
+   Pointer pnt;
+   AsnWriteFunc func = NULL;
+   Boolean retval = FALSE;
+
+   if (! loaded)
+   {
+      if (! objmacroAsnLoad())
+      return FALSE;
+   }
+
+   if (aip == NULL)
+   return FALSE;
+
+   atp = AsnLinkType(orig, APPLY_TABLE_EXTRA_DATA);   /* link local tree */
+   if (atp == NULL) {
+      return FALSE;
+   }
+
+   if (anp == NULL) { AsnNullValueMsg(aip, atp); goto erret; }
+
+   av.ptrvalue = (Pointer)anp;
+   if (! AsnWriteChoice(aip, atp, (Int2)anp->choice, &av)) {
+      goto erret;
+   }
+
+   pnt = anp->data.ptrvalue;
+   switch (anp->choice)
+   {
+   case ApplyTableExtraData_table:
+      av.boolvalue = anp->data.boolvalue;
+      retval = AsnWrite(aip, APPLY_TABLE_EXTRA_DATA_table, &av);
+      break;
+   }
+   if (writetype != NULL) {
+      retval = (* func)(pnt, aip, writetype);   /* write it out */
+   }
+   if (!retval) {
+      goto erret;
+   }
+   retval = TRUE;
+
+erret:
+   AsnUnlinkType(orig);       /* unlink local tree */
+   return retval;
+}
+
+
+/**************************************************
+*
+*    ApplyTableActionNew()
+*
+**************************************************/
+NLM_EXTERN 
+ApplyTableActionPtr LIBCALL
+ApplyTableActionNew(void)
+{
+   ApplyTableActionPtr ptr = MemNew((size_t) sizeof(ApplyTableAction));
+
+   return ptr;
+
+}
+
+
+/**************************************************
+*
+*    ApplyTableActionFree()
+*
+**************************************************/
+NLM_EXTERN 
+ApplyTableActionPtr LIBCALL
+ApplyTableActionFree(ApplyTableActionPtr ptr)
+{
+
+   if(ptr == NULL) {
+      return NULL;
+   }
+   MemFree(ptr -> filename);
+   TableMatchFree(ptr -> match_type);
+   ApplyTableExtraDataFree(ptr -> in_memory_table);
+   return MemFree(ptr);
+}
+
+
+/**************************************************
+*
+*    ApplyTableActionAsnRead()
+*
+**************************************************/
+NLM_EXTERN 
+ApplyTableActionPtr LIBCALL
+ApplyTableActionAsnRead(AsnIoPtr aip, AsnTypePtr orig)
+{
+   DataVal av;
+   AsnTypePtr atp;
+   Boolean isError = FALSE;
+   AsnReadFunc func;
+   ApplyTableActionPtr ptr;
+
+   if (! loaded)
+   {
+      if (! objmacroAsnLoad()) {
+         return NULL;
+      }
+   }
+
+   if (aip == NULL) {
+      return NULL;
+   }
+
+   if (orig == NULL) {         /* ApplyTableAction ::= (self contained) */
+      atp = AsnReadId(aip, amp, APPLY_TABLE_ACTION);
+   } else {
+      atp = AsnLinkType(orig, APPLY_TABLE_ACTION);
+   }
+   /* link in local tree */
+   if (atp == NULL) {
+      return NULL;
+   }
+
+   ptr = ApplyTableActionNew();
+   if (ptr == NULL) {
+      goto erret;
+   }
+   if (AsnReadVal(aip, atp, &av) <= 0) { /* read the start struct */
+      goto erret;
+   }
+
+   atp = AsnReadId(aip,amp, atp);
+   func = NULL;
+
+   if (atp == APPLY_TABLE_ACTION_filename) {
+      if ( AsnReadVal(aip, atp, &av) <= 0) {
+         goto erret;
+      }
+      ptr -> filename = av.ptrvalue;
+      atp = AsnReadId(aip,amp, atp);
+   }
+   if (atp == APPLY_TABLE_ACTION_match_type) {
+      ptr -> match_type = TableMatchAsnRead(aip, atp);
+      if (aip -> io_failure) {
+         goto erret;
+      }
+      atp = AsnReadId(aip,amp, atp);
+   }
+   if (atp == APPLY_TABLE_ACTION_in_memory_table) {
+      ptr -> in_memory_table = ApplyTableExtraDataAsnRead(aip, atp);
+      if (aip -> io_failure) {
+         goto erret;
+      }
+      atp = AsnReadId(aip,amp, atp);
+   }
+
+   if (AsnReadVal(aip, atp, &av) <= 0) {
+      goto erret;
+   }
+   /* end struct */
+
+ret:
+   AsnUnlinkType(orig);       /* unlink local tree */
+   return ptr;
+
+erret:
+   aip -> io_failure = TRUE;
+   ptr = ApplyTableActionFree(ptr);
+   goto ret;
+}
+
+
+
+/**************************************************
+*
+*    ApplyTableActionAsnWrite()
+*
+**************************************************/
+NLM_EXTERN Boolean LIBCALL 
+ApplyTableActionAsnWrite(ApplyTableActionPtr ptr, AsnIoPtr aip, AsnTypePtr orig)
+{
+   DataVal av;
+   AsnTypePtr atp;
+   Boolean retval = FALSE;
+
+   if (! loaded)
+   {
+      if (! objmacroAsnLoad()) {
+         return FALSE;
+      }
+   }
+
+   if (aip == NULL) {
+      return FALSE;
+   }
+
+   atp = AsnLinkType(orig, APPLY_TABLE_ACTION);   /* link local tree */
+   if (atp == NULL) {
+      return FALSE;
+   }
+
+   if (ptr == NULL) { AsnNullValueMsg(aip, atp); goto erret; }
+   if (! AsnOpenStruct(aip, atp, (Pointer) ptr)) {
+      goto erret;
+   }
+
+   if (ptr -> filename != NULL) {
+      av.ptrvalue = ptr -> filename;
+      retval = AsnWrite(aip, APPLY_TABLE_ACTION_filename,  &av);
+   }
+   if (ptr -> match_type != NULL) {
+      if ( ! TableMatchAsnWrite(ptr -> match_type, aip, APPLY_TABLE_ACTION_match_type)) {
+         goto erret;
+      }
+   }
+   if (ptr -> in_memory_table != NULL) {
+      if ( ! ApplyTableExtraDataAsnWrite(ptr -> in_memory_table, aip, APPLY_TABLE_ACTION_in_memory_table)) {
+         goto erret;
+      }
+   }
+   if (! AsnCloseStruct(aip, atp, (Pointer)ptr)) {
+      goto erret;
+   }
+   retval = TRUE;
+
+erret:
+   AsnUnlinkType(orig);       /* unlink local tree */
+   return retval;
+}
+
+
+
+/**************************************************
+*
+*    AddFileActionNew()
+*
+**************************************************/
+NLM_EXTERN 
+AddFileActionPtr LIBCALL
+AddFileActionNew(void)
+{
+   AddFileActionPtr ptr = MemNew((size_t) sizeof(AddFileAction));
+
+   return ptr;
+
+}
+
+
+/**************************************************
+*
+*    AddFileActionFree()
+*
+**************************************************/
+NLM_EXTERN 
+AddFileActionPtr LIBCALL
+AddFileActionFree(AddFileActionPtr ptr)
+{
+
+   if(ptr == NULL) {
+      return NULL;
+   }
+   MemFree(ptr -> filename);
+   ApplyTableExtraDataFree(ptr -> in_memory_table);
+   return MemFree(ptr);
+}
+
+
+/**************************************************
+*
+*    AddFileActionAsnRead()
+*
+**************************************************/
+NLM_EXTERN 
+AddFileActionPtr LIBCALL
+AddFileActionAsnRead(AsnIoPtr aip, AsnTypePtr orig)
+{
+   DataVal av;
+   AsnTypePtr atp;
+   Boolean isError = FALSE;
+   AsnReadFunc func;
+   AddFileActionPtr ptr;
+
+   if (! loaded)
+   {
+      if (! objmacroAsnLoad()) {
+         return NULL;
+      }
+   }
+
+   if (aip == NULL) {
+      return NULL;
+   }
+
+   if (orig == NULL) {         /* AddFileAction ::= (self contained) */
+      atp = AsnReadId(aip, amp, ADD_FILE_ACTION);
+   } else {
+      atp = AsnLinkType(orig, ADD_FILE_ACTION);
+   }
+   /* link in local tree */
+   if (atp == NULL) {
+      return NULL;
+   }
+
+   ptr = AddFileActionNew();
+   if (ptr == NULL) {
+      goto erret;
+   }
+   if (AsnReadVal(aip, atp, &av) <= 0) { /* read the start struct */
+      goto erret;
+   }
+
+   atp = AsnReadId(aip,amp, atp);
+   func = NULL;
+
+   if (atp == ADD_FILE_ACTION_filename) {
+      if ( AsnReadVal(aip, atp, &av) <= 0) {
+         goto erret;
+      }
+      ptr -> filename = av.ptrvalue;
+      atp = AsnReadId(aip,amp, atp);
+   }
+   if (atp == ADD_FILE_ACTION_in_memory_table) {
+      ptr -> in_memory_table = ApplyTableExtraDataAsnRead(aip, atp);
+      if (aip -> io_failure) {
+         goto erret;
+      }
+      atp = AsnReadId(aip,amp, atp);
+   }
+
+   if (AsnReadVal(aip, atp, &av) <= 0) {
+      goto erret;
+   }
+   /* end struct */
+
+ret:
+   AsnUnlinkType(orig);       /* unlink local tree */
+   return ptr;
+
+erret:
+   aip -> io_failure = TRUE;
+   ptr = AddFileActionFree(ptr);
+   goto ret;
+}
+
+
+
+/**************************************************
+*
+*    AddFileActionAsnWrite()
+*
+**************************************************/
+NLM_EXTERN Boolean LIBCALL 
+AddFileActionAsnWrite(AddFileActionPtr ptr, AsnIoPtr aip, AsnTypePtr orig)
+{
+   DataVal av;
+   AsnTypePtr atp;
+   Boolean retval = FALSE;
+
+   if (! loaded)
+   {
+      if (! objmacroAsnLoad()) {
+         return FALSE;
+      }
+   }
+
+   if (aip == NULL) {
+      return FALSE;
+   }
+
+   atp = AsnLinkType(orig, ADD_FILE_ACTION);   /* link local tree */
+   if (atp == NULL) {
+      return FALSE;
+   }
+
+   if (ptr == NULL) { AsnNullValueMsg(aip, atp); goto erret; }
+   if (! AsnOpenStruct(aip, atp, (Pointer) ptr)) {
+      goto erret;
+   }
+
+   if (ptr -> filename != NULL) {
+      av.ptrvalue = ptr -> filename;
+      retval = AsnWrite(aip, ADD_FILE_ACTION_filename,  &av);
+   }
+   if (ptr -> in_memory_table != NULL) {
+      if ( ! ApplyTableExtraDataAsnWrite(ptr -> in_memory_table, aip, ADD_FILE_ACTION_in_memory_table)) {
+         goto erret;
+      }
+   }
+   if (! AsnCloseStruct(aip, atp, (Pointer)ptr)) {
+      goto erret;
+   }
+   retval = TRUE;
+
+erret:
+   AsnUnlinkType(orig);       /* unlink local tree */
+   return retval;
+}
+
+
+
+/**************************************************
+*
+*    AddDescriptorListActionNew()
+*
+**************************************************/
+NLM_EXTERN 
+AddDescriptorListActionPtr LIBCALL
+AddDescriptorListActionNew(void)
+{
+   AddDescriptorListActionPtr ptr = MemNew((size_t) sizeof(AddDescriptorListAction));
+
+   return ptr;
+
+}
+
+
+/**************************************************
+*
+*    AddDescriptorListActionFree()
+*
+**************************************************/
+NLM_EXTERN 
+AddDescriptorListActionPtr LIBCALL
+AddDescriptorListActionFree(AddDescriptorListActionPtr ptr)
+{
+
+   if(ptr == NULL) {
+      return NULL;
+   }
+   AddFileActionFree(ptr -> descriptor_list);
+   ConstraintChoiceSetFree(ptr -> constraint);
+   return MemFree(ptr);
+}
+
+
+/**************************************************
+*
+*    AddDescriptorListActionAsnRead()
+*
+**************************************************/
+NLM_EXTERN 
+AddDescriptorListActionPtr LIBCALL
+AddDescriptorListActionAsnRead(AsnIoPtr aip, AsnTypePtr orig)
+{
+   DataVal av;
+   AsnTypePtr atp;
+   Boolean isError = FALSE;
+   AsnReadFunc func;
+   AddDescriptorListActionPtr ptr;
+
+   if (! loaded)
+   {
+      if (! objmacroAsnLoad()) {
+         return NULL;
+      }
+   }
+
+   if (aip == NULL) {
+      return NULL;
+   }
+
+   if (orig == NULL) {         /* AddDescriptorListAction ::= (self contained) */
+      atp = AsnReadId(aip, amp, ADD_DESCRIPTOR_LIST_ACTION);
+   } else {
+      atp = AsnLinkType(orig, ADD_DESCRIPTOR_LIST_ACTION);
+   }
+   /* link in local tree */
+   if (atp == NULL) {
+      return NULL;
+   }
+
+   ptr = AddDescriptorListActionNew();
+   if (ptr == NULL) {
+      goto erret;
+   }
+   if (AsnReadVal(aip, atp, &av) <= 0) { /* read the start struct */
+      goto erret;
+   }
+
+   atp = AsnReadId(aip,amp, atp);
+   func = NULL;
+
+   if (atp == ADD_DESCRIPTOR_LIST_ACTION_descriptor_list) {
+      ptr -> descriptor_list = AddFileActionAsnRead(aip, atp);
+      if (aip -> io_failure) {
+         goto erret;
+      }
+      atp = AsnReadId(aip,amp, atp);
+   }
+   if (atp == ADD_DESCRIPTOR_LIST_ACTION_constraint) {
+      ptr -> constraint = ConstraintChoiceSetAsnRead(aip, atp);
+      if (aip -> io_failure) {
+         goto erret;
+      }
+      atp = AsnReadId(aip,amp, atp);
+   }
+
+   if (AsnReadVal(aip, atp, &av) <= 0) {
+      goto erret;
+   }
+   /* end struct */
+
+ret:
+   AsnUnlinkType(orig);       /* unlink local tree */
+   return ptr;
+
+erret:
+   aip -> io_failure = TRUE;
+   ptr = AddDescriptorListActionFree(ptr);
+   goto ret;
+}
+
+
+
+/**************************************************
+*
+*    AddDescriptorListActionAsnWrite()
+*
+**************************************************/
+NLM_EXTERN Boolean LIBCALL 
+AddDescriptorListActionAsnWrite(AddDescriptorListActionPtr ptr, AsnIoPtr aip, AsnTypePtr orig)
+{
+   DataVal av;
+   AsnTypePtr atp;
+   Boolean retval = FALSE;
+
+   if (! loaded)
+   {
+      if (! objmacroAsnLoad()) {
+         return FALSE;
+      }
+   }
+
+   if (aip == NULL) {
+      return FALSE;
+   }
+
+   atp = AsnLinkType(orig, ADD_DESCRIPTOR_LIST_ACTION);   /* link local tree */
+   if (atp == NULL) {
+      return FALSE;
+   }
+
+   if (ptr == NULL) { AsnNullValueMsg(aip, atp); goto erret; }
+   if (! AsnOpenStruct(aip, atp, (Pointer) ptr)) {
+      goto erret;
+   }
+
+   if (ptr -> descriptor_list != NULL) {
+      if ( ! AddFileActionAsnWrite(ptr -> descriptor_list, aip, ADD_DESCRIPTOR_LIST_ACTION_descriptor_list)) {
+         goto erret;
+      }
+   }
+   if (ptr -> constraint != NULL) {
+      if ( ! ConstraintChoiceSetAsnWrite(ptr -> constraint, aip, ADD_DESCRIPTOR_LIST_ACTION_constraint)) {
+         goto erret;
+      }
+   }
+   if (! AsnCloseStruct(aip, atp, (Pointer)ptr)) {
+      goto erret;
+   }
+   retval = TRUE;
+
+erret:
+   AsnUnlinkType(orig);       /* unlink local tree */
+   return retval;
+}
+
+
+
+/**************************************************
+*
+*    RemoveSequencesActionNew()
+*
+**************************************************/
+NLM_EXTERN 
+RemoveSequencesActionPtr LIBCALL
+RemoveSequencesActionNew(void)
+{
+   RemoveSequencesActionPtr ptr = MemNew((size_t) sizeof(RemoveSequencesAction));
+
+   return ptr;
+
+}
+
+
+/**************************************************
+*
+*    RemoveSequencesActionFree()
+*
+**************************************************/
+NLM_EXTERN 
+RemoveSequencesActionPtr LIBCALL
+RemoveSequencesActionFree(RemoveSequencesActionPtr ptr)
+{
+
+   if(ptr == NULL) {
+      return NULL;
+   }
+   ConstraintChoiceSetFree(ptr -> constraint);
+   return MemFree(ptr);
+}
+
+
+/**************************************************
+*
+*    RemoveSequencesActionAsnRead()
+*
+**************************************************/
+NLM_EXTERN 
+RemoveSequencesActionPtr LIBCALL
+RemoveSequencesActionAsnRead(AsnIoPtr aip, AsnTypePtr orig)
+{
+   DataVal av;
+   AsnTypePtr atp;
+   Boolean isError = FALSE;
+   AsnReadFunc func;
+   RemoveSequencesActionPtr ptr;
+
+   if (! loaded)
+   {
+      if (! objmacroAsnLoad()) {
+         return NULL;
+      }
+   }
+
+   if (aip == NULL) {
+      return NULL;
+   }
+
+   if (orig == NULL) {         /* RemoveSequencesAction ::= (self contained) */
+      atp = AsnReadId(aip, amp, REMOVE_SEQUENCES_ACTION);
+   } else {
+      atp = AsnLinkType(orig, REMOVE_SEQUENCES_ACTION);
+   }
+   /* link in local tree */
+   if (atp == NULL) {
+      return NULL;
+   }
+
+   ptr = RemoveSequencesActionNew();
+   if (ptr == NULL) {
+      goto erret;
+   }
+   if (AsnReadVal(aip, atp, &av) <= 0) { /* read the start struct */
+      goto erret;
+   }
+
+   atp = AsnReadId(aip,amp, atp);
+   func = NULL;
+
+   if (atp == REMOVE_SEQUENCES_ACTION_constraint) {
+      ptr -> constraint = ConstraintChoiceSetAsnRead(aip, atp);
+      if (aip -> io_failure) {
+         goto erret;
+      }
+      atp = AsnReadId(aip,amp, atp);
+   }
+
+   if (AsnReadVal(aip, atp, &av) <= 0) {
+      goto erret;
+   }
+   /* end struct */
+
+ret:
+   AsnUnlinkType(orig);       /* unlink local tree */
+   return ptr;
+
+erret:
+   aip -> io_failure = TRUE;
+   ptr = RemoveSequencesActionFree(ptr);
+   goto ret;
+}
+
+
+
+/**************************************************
+*
+*    RemoveSequencesActionAsnWrite()
+*
+**************************************************/
+NLM_EXTERN Boolean LIBCALL 
+RemoveSequencesActionAsnWrite(RemoveSequencesActionPtr ptr, AsnIoPtr aip, AsnTypePtr orig)
+{
+   DataVal av;
+   AsnTypePtr atp;
+   Boolean retval = FALSE;
+
+   if (! loaded)
+   {
+      if (! objmacroAsnLoad()) {
+         return FALSE;
+      }
+   }
+
+   if (aip == NULL) {
+      return FALSE;
+   }
+
+   atp = AsnLinkType(orig, REMOVE_SEQUENCES_ACTION);   /* link local tree */
+   if (atp == NULL) {
+      return FALSE;
+   }
+
+   if (ptr == NULL) { AsnNullValueMsg(aip, atp); goto erret; }
+   if (! AsnOpenStruct(aip, atp, (Pointer) ptr)) {
+      goto erret;
+   }
+
+   if (ptr -> constraint != NULL) {
+      if ( ! ConstraintChoiceSetAsnWrite(ptr -> constraint, aip, REMOVE_SEQUENCES_ACTION_constraint)) {
+         goto erret;
+      }
+   }
+   if (! AsnCloseStruct(aip, atp, (Pointer)ptr)) {
+      goto erret;
+   }
+   retval = TRUE;
+
+erret:
+   AsnUnlinkType(orig);       /* unlink local tree */
+   return retval;
+}
+
+
+
+/**************************************************
+*
 *    MacroActionChoiceFree()
 *
 **************************************************/
@@ -18887,6 +21571,27 @@ MacroActionChoiceFree(ValNodePtr anp)
    case MacroActionChoice_fix_author:
       AuthorFixActionFree(anp -> data.ptrvalue);
       break;
+   case MacroActionChoice_update_sequences:
+      UpdateSequencesActionFree(anp -> data.ptrvalue);
+      break;
+   case MacroActionChoice_create_tsa_ids:
+      CreateTSAIdsActionFree(anp -> data.ptrvalue);
+      break;
+   case MacroActionChoice_perform_autofix:
+      AutofixActionFree(anp -> data.ptrvalue);
+      break;
+   case MacroActionChoice_fix_sets:
+      FixSetsActionFree(anp -> data.ptrvalue);
+      break;
+   case MacroActionChoice_apply_table:
+      ApplyTableActionFree(anp -> data.ptrvalue);
+      break;
+   case MacroActionChoice_remove_sequences:
+      RemoveSequencesActionFree(anp -> data.ptrvalue);
+      break;
+   case MacroActionChoice_add_file_descriptors:
+      AddDescriptorListActionFree(anp -> data.ptrvalue);
+      break;
    }
    return MemFree(anp);
 }
@@ -18955,19 +21660,19 @@ MacroActionChoiceAsnRead(AsnIoPtr aip, AsnTypePtr orig)
       choice = MacroActionChoice_add_feature;
       func = (AsnReadFunc) ApplyFeatureActionAsnRead;
    }
-   else if (atp == ACTION_CHOICE_remove_feature) {
+   else if (atp == MACRO_ACTION_CHOICE_remove_feature) {
       choice = MacroActionChoice_remove_feature;
       func = (AsnReadFunc) RemoveFeatureActionAsnRead;
    }
-   else if (atp == ACTION_CHOICE_convert_feature) {
+   else if (atp == MACRO_ACTION_CHOICE_convert_feature) {
       choice = MacroActionChoice_convert_feature;
       func = (AsnReadFunc) ConvertFeatureActionAsnRead;
    }
-   else if (atp == ACTION_CHOICE_edit_location) {
+   else if (atp == MACRO_ACTION_CHOICE_edit_location) {
       choice = MacroActionChoice_edit_location;
       func = (AsnReadFunc) EditFeatureLocationActionAsnRead;
    }
-   else if (atp == CHOICE_remove_descriptor) {
+   else if (atp == MACRO_ACTION_CHOICE_remove_descriptor) {
       choice = MacroActionChoice_remove_descriptor;
       func = (AsnReadFunc) RemoveDescriptorActionAsnRead;
    }
@@ -18982,46 +21687,46 @@ MacroActionChoiceAsnRead(AsnIoPtr aip, AsnTypePtr orig)
       }
       anp->data.boolvalue = av.boolvalue;
    }
-   else if (atp == trim_junk_from_primer_seq) {
+   else if (atp == MACRO_ACTION_CHOICE_trim_junk_from_primer_seq) {
       choice = MacroActionChoice_trim_junk_from_primer_seq;
       if (AsnReadVal(aip, atp, &av) <= 0) {
          goto erret;
       }
       anp->data.boolvalue = av.boolvalue;
    }
-   else if (atp == trim_stop_from_complete_cds) {
+   else if (atp == MACRO_ACTION_CHOICE_trim_stop_from_complete_cds) {
       choice = MacroActionChoice_trim_stop_from_complete_cds;
       if (AsnReadVal(aip, atp, &av) <= 0) {
          goto erret;
       }
       anp->data.boolvalue = av.boolvalue;
    }
-   else if (atp == CHOICE_fix_usa_and_states) {
+   else if (atp == MACRO_ACTION_CHOICE_fix_usa_and_states) {
       choice = MacroActionChoice_fix_usa_and_states;
       if (AsnReadVal(aip, atp, &av) <= 0) {
          goto erret;
       }
       anp->data.boolvalue = av.boolvalue;
    }
-   else if (atp == synchronize_cds_partials) {
+   else if (atp == MACRO_ACTION_CHOICE_synchronize_cds_partials) {
       choice = MacroActionChoice_synchronize_cds_partials;
       if (AsnReadVal(aip, atp, &av) <= 0) {
          goto erret;
       }
       anp->data.boolvalue = av.boolvalue;
    }
-   else if (atp == adjust_for_consensus_splice) {
+   else if (atp == MACRO_ACTION_CHOICE_adjust_for_consensus_splice) {
       choice = MacroActionChoice_adjust_for_consensus_splice;
       if (AsnReadVal(aip, atp, &av) <= 0) {
          goto erret;
       }
       anp->data.boolvalue = av.boolvalue;
    }
-   else if (atp == ACTION_CHOICE_fix_pub_caps) {
+   else if (atp == MACRO_ACTION_CHOICE_fix_pub_caps) {
       choice = MacroActionChoice_fix_pub_caps;
       func = (AsnReadFunc) FixPubCapsActionAsnRead;
    }
-   else if (atp == ACTION_CHOICE_remove_seg_gaps) {
+   else if (atp == MACRO_ACTION_CHOICE_remove_seg_gaps) {
       choice = MacroActionChoice_remove_seg_gaps;
       if (AsnReadVal(aip, atp, &av) <= 0) {
          goto erret;
@@ -19032,7 +21737,7 @@ MacroActionChoiceAsnRead(AsnIoPtr aip, AsnTypePtr orig)
       choice = MacroActionChoice_sort_fields;
       func = (AsnReadFunc) SortFieldsActionAsnRead;
    }
-   else if (atp == CHOICE_apply_molinfo_block) {
+   else if (atp == MACRO_ACTION_CHOICE_apply_molinfo_block) {
       choice = MacroActionChoice_apply_molinfo_block;
       func = (AsnReadFunc) MolinfoBlockAsnRead;
    }
@@ -19051,26 +21756,26 @@ MacroActionChoiceAsnRead(AsnIoPtr aip, AsnTypePtr orig)
       }
       anp->data.boolvalue = av.boolvalue;
    }
-   else if (atp == remove_duplicate_features) {
+   else if (atp == MACRO_ACTION_CHOICE_remove_duplicate_features) {
       choice = MacroActionChoice_remove_duplicate_features;
       func = (AsnReadFunc) RemoveDuplicateFeatureActionAsnRead;
    }
-   else if (atp == CHOICE_remove_lineage_notes) {
+   else if (atp == MACRO_ACTION_CHOICE_remove_lineage_notes) {
       choice = MacroActionChoice_remove_lineage_notes;
       if (AsnReadVal(aip, atp, &av) <= 0) {
          goto erret;
       }
       anp->data.boolvalue = av.boolvalue;
    }
-   else if (atp == ACTION_CHOICE_remove_xrefs) {
+   else if (atp == MACRO_ACTION_CHOICE_remove_xrefs) {
       choice = MacroActionChoice_remove_xrefs;
       func = (AsnReadFunc) RemoveXrefsActionAsnRead;
    }
-   else if (atp == ACTION_CHOICE_make_gene_xrefs) {
+   else if (atp == MACRO_ACTION_CHOICE_make_gene_xrefs) {
       choice = MacroActionChoice_make_gene_xrefs;
       func = (AsnReadFunc) MakeGeneXrefActionAsnRead;
    }
-   else if (atp == ACTION_CHOICE_make_bold_xrefs) {
+   else if (atp == MACRO_ACTION_CHOICE_make_bold_xrefs) {
       choice = MacroActionChoice_make_bold_xrefs;
       if (AsnReadVal(aip, atp, &av) <= 0) {
          goto erret;
@@ -19081,6 +21786,69 @@ MacroActionChoiceAsnRead(AsnIoPtr aip, AsnTypePtr orig)
       choice = MacroActionChoice_fix_author;
       func = (AsnReadFunc) AuthorFixActionAsnRead;
    }
+   else if (atp == MACRO_ACTION_CHOICE_update_sequences) {
+      choice = MacroActionChoice_update_sequences;
+      func = (AsnReadFunc) UpdateSequencesActionAsnRead;
+   }
+   else if (atp == MACRO_ACTION_CHOICE_add_trans_splicing) {
+      choice = MacroActionChoice_add_trans_splicing;
+      if (AsnReadVal(aip, atp, &av) <= 0) {
+         goto erret;
+      }
+      anp->data.boolvalue = av.boolvalue;
+   }
+   else if (atp == MACRO_ACTION_CHOICE_remove_invalid_ecnumbers) {
+      choice = MacroActionChoice_remove_invalid_ecnumbers;
+      if (AsnReadVal(aip, atp, &av) <= 0) {
+         goto erret;
+      }
+      anp->data.boolvalue = av.boolvalue;
+   }
+   else if (atp == MACRO_ACTION_CHOICE_create_tsa_ids) {
+      choice = MacroActionChoice_create_tsa_ids;
+      func = (AsnReadFunc) CreateTSAIdsActionAsnRead;
+   }
+   else if (atp == MACRO_ACTION_CHOICE_perform_autofix) {
+      choice = MacroActionChoice_perform_autofix;
+      func = (AsnReadFunc) AutofixActionAsnRead;
+   }
+   else if (atp == MACRO_ACTION_CHOICE_fix_sets) {
+      choice = MacroActionChoice_fix_sets;
+      func = (AsnReadFunc) FixSetsActionAsnRead;
+   }
+   else if (atp == MACRO_ACTION_CHOICE_apply_table) {
+      choice = MacroActionChoice_apply_table;
+      func = (AsnReadFunc) ApplyTableActionAsnRead;
+   }
+   else if (atp == MACRO_ACTION_CHOICE_remove_sequences) {
+      choice = MacroActionChoice_remove_sequences;
+      func = (AsnReadFunc) RemoveSequencesActionAsnRead;
+   }
+   else if (atp == MACRO_ACTION_CHOICE_propagate_sequence_technology) {
+      choice = MacroActionChoice_propagate_sequence_technology;
+      if (AsnReadVal(aip, atp, &av) <= 0) {
+         goto erret;
+      }
+      anp->data.boolvalue = av.boolvalue;
+   }
+   else if (atp == MACRO_ACTION_CHOICE_add_file_descriptors) {
+      choice = MacroActionChoice_add_file_descriptors;
+      func = (AsnReadFunc) AddDescriptorListActionAsnRead;
+   }
+   else if (atp == MACRO_ACTION_CHOICE_propagate_missing_old_name) {
+      choice = MacroActionChoice_propagate_missing_old_name;
+      if (AsnReadVal(aip, atp, &av) <= 0) {
+         goto erret;
+      }
+      anp->data.boolvalue = av.boolvalue;
+   }
+   else if (atp == MACRO_ACTION_CHOICE_autoapply_structured_comments) {
+      choice = MacroActionChoice_autoapply_structured_comments;
+      if (AsnReadVal(aip, atp, &av) <= 0) {
+         goto erret;
+      }
+      anp->data.boolvalue = av.boolvalue;
+   }
    anp->choice = choice;
    if (func != NULL)
    {
@@ -19155,19 +21923,19 @@ MacroActionChoiceAsnWrite(MacroActionChoicePtr anp, AsnIoPtr aip, AsnTypePtr ori
       func = (AsnWriteFunc) ApplyFeatureActionAsnWrite;
       break;
    case MacroActionChoice_remove_feature:
-      writetype = ACTION_CHOICE_remove_feature;
+      writetype = MACRO_ACTION_CHOICE_remove_feature;
       func = (AsnWriteFunc) RemoveFeatureActionAsnWrite;
       break;
    case MacroActionChoice_convert_feature:
-      writetype = ACTION_CHOICE_convert_feature;
+      writetype = MACRO_ACTION_CHOICE_convert_feature;
       func = (AsnWriteFunc) ConvertFeatureActionAsnWrite;
       break;
    case MacroActionChoice_edit_location:
-      writetype = ACTION_CHOICE_edit_location;
+      writetype = MACRO_ACTION_CHOICE_edit_location;
       func = (AsnWriteFunc) EditFeatureLocationActionAsnWrite;
       break;
    case MacroActionChoice_remove_descriptor:
-      writetype = CHOICE_remove_descriptor;
+      writetype = MACRO_ACTION_CHOICE_remove_descriptor;
       func = (AsnWriteFunc) RemoveDescriptorActionAsnWrite;
       break;
    case MacroActionChoice_autodef:
@@ -19180,38 +21948,38 @@ MacroActionChoiceAsnWrite(MacroActionChoicePtr anp, AsnIoPtr aip, AsnTypePtr ori
       break;
    case MacroActionChoice_trim_junk_from_primer_seq:
       av.boolvalue = anp->data.boolvalue;
-      retval = AsnWrite(aip, trim_junk_from_primer_seq, &av);
+      retval = AsnWrite(aip, MACRO_ACTION_CHOICE_trim_junk_from_primer_seq, &av);
       break;
    case MacroActionChoice_trim_stop_from_complete_cds:
       av.boolvalue = anp->data.boolvalue;
-      retval = AsnWrite(aip, trim_stop_from_complete_cds, &av);
+      retval = AsnWrite(aip, MACRO_ACTION_CHOICE_trim_stop_from_complete_cds, &av);
       break;
    case MacroActionChoice_fix_usa_and_states:
       av.boolvalue = anp->data.boolvalue;
-      retval = AsnWrite(aip, CHOICE_fix_usa_and_states, &av);
+      retval = AsnWrite(aip, MACRO_ACTION_CHOICE_fix_usa_and_states, &av);
       break;
    case MacroActionChoice_synchronize_cds_partials:
       av.boolvalue = anp->data.boolvalue;
-      retval = AsnWrite(aip, synchronize_cds_partials, &av);
+      retval = AsnWrite(aip, MACRO_ACTION_CHOICE_synchronize_cds_partials, &av);
       break;
    case MacroActionChoice_adjust_for_consensus_splice:
       av.boolvalue = anp->data.boolvalue;
-      retval = AsnWrite(aip, adjust_for_consensus_splice, &av);
+      retval = AsnWrite(aip, MACRO_ACTION_CHOICE_adjust_for_consensus_splice, &av);
       break;
    case MacroActionChoice_fix_pub_caps:
-      writetype = ACTION_CHOICE_fix_pub_caps;
+      writetype = MACRO_ACTION_CHOICE_fix_pub_caps;
       func = (AsnWriteFunc) FixPubCapsActionAsnWrite;
       break;
    case MacroActionChoice_remove_seg_gaps:
       av.boolvalue = anp->data.boolvalue;
-      retval = AsnWrite(aip, ACTION_CHOICE_remove_seg_gaps, &av);
+      retval = AsnWrite(aip, MACRO_ACTION_CHOICE_remove_seg_gaps, &av);
       break;
    case MacroActionChoice_sort_fields:
       writetype = MACRO_ACTION_CHOICE_sort_fields;
       func = (AsnWriteFunc) SortFieldsActionAsnWrite;
       break;
    case MacroActionChoice_apply_molinfo_block:
-      writetype = CHOICE_apply_molinfo_block;
+      writetype = MACRO_ACTION_CHOICE_apply_molinfo_block;
       func = (AsnWriteFunc) MolinfoBlockAsnWrite;
       break;
    case MacroActionChoice_fix_caps:
@@ -19227,29 +21995,77 @@ MacroActionChoiceAsnWrite(MacroActionChoicePtr anp, AsnIoPtr aip, AsnTypePtr ori
       retval = AsnWrite(aip, MACRO_ACTION_CHOICE_fix_spell, &av);
       break;
    case MacroActionChoice_remove_duplicate_features:
-      writetype = remove_duplicate_features;
+      writetype = MACRO_ACTION_CHOICE_remove_duplicate_features;
       func = (AsnWriteFunc) RemoveDuplicateFeatureActionAsnWrite;
       break;
    case MacroActionChoice_remove_lineage_notes:
       av.boolvalue = anp->data.boolvalue;
-      retval = AsnWrite(aip, CHOICE_remove_lineage_notes, &av);
+      retval = AsnWrite(aip, MACRO_ACTION_CHOICE_remove_lineage_notes, &av);
       break;
    case MacroActionChoice_remove_xrefs:
-      writetype = ACTION_CHOICE_remove_xrefs;
+      writetype = MACRO_ACTION_CHOICE_remove_xrefs;
       func = (AsnWriteFunc) RemoveXrefsActionAsnWrite;
       break;
    case MacroActionChoice_make_gene_xrefs:
-      writetype = ACTION_CHOICE_make_gene_xrefs;
+      writetype = MACRO_ACTION_CHOICE_make_gene_xrefs;
       func = (AsnWriteFunc) MakeGeneXrefActionAsnWrite;
       break;
    case MacroActionChoice_make_bold_xrefs:
       av.boolvalue = anp->data.boolvalue;
-      retval = AsnWrite(aip, ACTION_CHOICE_make_bold_xrefs, &av);
+      retval = AsnWrite(aip, MACRO_ACTION_CHOICE_make_bold_xrefs, &av);
       break;
    case MacroActionChoice_fix_author:
       writetype = MACRO_ACTION_CHOICE_fix_author;
       func = (AsnWriteFunc) AuthorFixActionAsnWrite;
       break;
+   case MacroActionChoice_update_sequences:
+      writetype = MACRO_ACTION_CHOICE_update_sequences;
+      func = (AsnWriteFunc) UpdateSequencesActionAsnWrite;
+      break;
+   case MacroActionChoice_add_trans_splicing:
+      av.boolvalue = anp->data.boolvalue;
+      retval = AsnWrite(aip, MACRO_ACTION_CHOICE_add_trans_splicing, &av);
+      break;
+   case MacroActionChoice_remove_invalid_ecnumbers:
+      av.boolvalue = anp->data.boolvalue;
+      retval = AsnWrite(aip, MACRO_ACTION_CHOICE_remove_invalid_ecnumbers, &av);
+      break;
+   case MacroActionChoice_create_tsa_ids:
+      writetype = MACRO_ACTION_CHOICE_create_tsa_ids;
+      func = (AsnWriteFunc) CreateTSAIdsActionAsnWrite;
+      break;
+   case MacroActionChoice_perform_autofix:
+      writetype = MACRO_ACTION_CHOICE_perform_autofix;
+      func = (AsnWriteFunc) AutofixActionAsnWrite;
+      break;
+   case MacroActionChoice_fix_sets:
+      writetype = MACRO_ACTION_CHOICE_fix_sets;
+      func = (AsnWriteFunc) FixSetsActionAsnWrite;
+      break;
+   case MacroActionChoice_apply_table:
+      writetype = MACRO_ACTION_CHOICE_apply_table;
+      func = (AsnWriteFunc) ApplyTableActionAsnWrite;
+      break;
+   case MacroActionChoice_remove_sequences:
+      writetype = MACRO_ACTION_CHOICE_remove_sequences;
+      func = (AsnWriteFunc) RemoveSequencesActionAsnWrite;
+      break;
+   case MacroActionChoice_propagate_sequence_technology:
+      av.boolvalue = anp->data.boolvalue;
+      retval = AsnWrite(aip, MACRO_ACTION_CHOICE_propagate_sequence_technology, &av);
+      break;
+   case MacroActionChoice_add_file_descriptors:
+      writetype = MACRO_ACTION_CHOICE_add_file_descriptors;
+      func = (AsnWriteFunc) AddDescriptorListActionAsnWrite;
+      break;
+   case MacroActionChoice_propagate_missing_old_name:
+      av.boolvalue = anp->data.boolvalue;
+      retval = AsnWrite(aip, MACRO_ACTION_CHOICE_propagate_missing_old_name, &av);
+      break;
+   case MacroActionChoice_autoapply_structured_comments:
+      av.boolvalue = anp->data.boolvalue;
+      retval = AsnWrite(aip, MACRO_ACTION_CHOICE_autoapply_structured_comments, &av);
+      break;
    }
    if (writetype != NULL) {
       retval = (* func)(pnt, aip, writetype);   /* write it out */
@@ -19361,7 +22177,7 @@ SearchFuncAsnRead(AsnIoPtr aip, AsnTypePtr orig)
       }
       anp->data.boolvalue = av.boolvalue;
    }
-   else if (atp == more_brackets_or_parentheses) {
+   else if (atp == SEARCH_FUNC_n_or_more_brackets_or_parentheses) {
       choice = SearchFunc_n_or_more_brackets_or_parentheses;
       if (AsnReadVal(aip, atp, &av) <= 0) {
          goto erret;
@@ -19488,7 +22304,7 @@ SearchFuncAsnWrite(SearchFuncPtr anp, AsnIoPtr aip, AsnTypePtr orig)
       break;
    case SearchFunc_n_or_more_brackets_or_parentheses:
       av.intvalue = anp->data.intvalue;
-      retval = AsnWrite(aip, more_brackets_or_parentheses, &av);
+      retval = AsnWrite(aip, SEARCH_FUNC_n_or_more_brackets_or_parentheses, &av);
       break;
    case SearchFunc_three_numbers:
       av.boolvalue = anp->data.boolvalue;
@@ -19630,7 +22446,7 @@ SimpleReplaceAsnRead(AsnIoPtr aip, AsnTypePtr orig)
       ptr -> whole_string = av.boolvalue;
       atp = AsnReadId(aip,amp, atp);
    }
-   if (atp == REPLACE_weasel_to_putative) {
+   if (atp == SIMPLE_REPLACE_weasel_to_putative) {
       if ( AsnReadVal(aip, atp, &av) <= 0) {
          goto erret;
       }
@@ -19695,7 +22511,7 @@ SimpleReplaceAsnWrite(SimpleReplacePtr ptr, AsnIoPtr aip, AsnTypePtr orig)
    av.boolvalue = ptr -> whole_string;
    retval = AsnWrite(aip, SIMPLE_REPLACE_whole_string,  &av);
    av.boolvalue = ptr -> weasel_to_putative;
-   retval = AsnWrite(aip, REPLACE_weasel_to_putative,  &av);
+   retval = AsnWrite(aip, SIMPLE_REPLACE_weasel_to_putative,  &av);
    if (! AsnCloseStruct(aip, atp, (Pointer)ptr)) {
       goto erret;
    }
@@ -20085,6 +22901,7 @@ SuspectRuleFree(SuspectRulePtr ptr)
    SearchFuncFree(ptr -> except);
    ConstraintChoiceSetFree(ptr -> feat_constraint);
    ReplaceRuleFree(ptr -> replace);
+   MemFree(ptr -> description);
    return MemFree(ptr);
 }
 
@@ -20171,6 +22988,13 @@ SuspectRuleAsnRead(AsnIoPtr aip, AsnTypePtr orig)
       }
       atp = AsnReadId(aip,amp, atp);
    }
+   if (atp == SUSPECT_RULE_description) {
+      if ( AsnReadVal(aip, atp, &av) <= 0) {
+         goto erret;
+      }
+      ptr -> description = av.ptrvalue;
+      atp = AsnReadId(aip,amp, atp);
+   }
 
    if (AsnReadVal(aip, atp, &av) <= 0) {
       goto erret;
@@ -20244,6 +23068,10 @@ SuspectRuleAsnWrite(SuspectRulePtr ptr, AsnIoPtr aip, AsnTypePtr orig)
          goto erret;
       }
    }
+   if (ptr -> description != NULL) {
+      av.ptrvalue = ptr -> description;
+      retval = AsnWrite(aip, SUSPECT_RULE_description,  &av);
+   }
    if (! AsnCloseStruct(aip, atp, (Pointer)ptr)) {
       goto erret;
    }
diff --git a/object/objmacro.h b/object/objmacro.h
index 2d0da156..bbe8c49b 100755
--- a/object/objmacro.h
+++ b/object/objmacro.h
@@ -17,7 +17,7 @@ extern "C" { /* } */
 /**************************************************
 *
 *    Generated objects for Module NCBI-Macro
-*    Generated using ASNCODE Revision: 6.17 at Jul 12, 2011 12:37 PM
+*    Generated using ASNCODE Revision: 6.19 at Jun 6, 2012 10:06 AM
 *
 **************************************************/
 
@@ -1182,6 +1182,7 @@ NLM_EXTERN Boolean LIBCALL StructuredCommentFieldPairAsnWrite PROTO (( Structure
 #define DBLink_field_type_bio_sample 2
 #define DBLink_field_type_probe_db 3
 #define DBLink_field_type_sequence_read_archve 4
+#define DBLink_field_type_bio_project 5
 
 
 
@@ -1442,6 +1443,7 @@ typedef struct struct_Sequence_constraint {
    ValNodePtr   seqtype;
    struct struct_String_constraint PNTR   id;
    Uint2   feature;
+   ValNodePtr   num_type_features;
    ValNodePtr   num_features;
    ValNodePtr   length;
    Uint2   strandedness;
@@ -1649,6 +1651,9 @@ NLM_EXTERN Boolean LIBCALL EditActionAsnWrite PROTO (( EditActionPtr , AsnIoPtr,
 #define Cap_change_toupper 2
 #define Cap_change_firstcap 3
 #define Cap_change_firstcaprestnochange 4
+#define Cap_change_firstlower_restnochange 5
+#define Cap_change_cap_word_space 6
+#define Cap_change_cap_word_space_punc 7
 
 typedef ValNodePtr TextTransformPtr;
 typedef ValNode TextTransform;
@@ -1778,6 +1783,25 @@ NLM_EXTERN RemoveActionPtr LIBCALL RemoveActionNew PROTO (( void ));
 NLM_EXTERN RemoveActionPtr LIBCALL RemoveActionAsnRead PROTO (( AsnIoPtr, AsnTypePtr));
 NLM_EXTERN Boolean LIBCALL RemoveActionAsnWrite PROTO (( RemoveActionPtr , AsnIoPtr, AsnTypePtr));
 
+
+
+/**************************************************
+*
+*    RemoveOutsideAction
+*
+**************************************************/
+typedef struct struct_Remove_outside_action {
+   struct struct_Text_portion PNTR   portion;
+   ValNodePtr   field;
+   Uint1   remove_if_not_found;
+} RemoveOutsideAction, PNTR RemoveOutsideActionPtr;
+
+
+NLM_EXTERN RemoveOutsideActionPtr LIBCALL RemoveOutsideActionFree PROTO ((RemoveOutsideActionPtr ));
+NLM_EXTERN RemoveOutsideActionPtr LIBCALL RemoveOutsideActionNew PROTO (( void ));
+NLM_EXTERN RemoveOutsideActionPtr LIBCALL RemoveOutsideActionAsnRead PROTO (( AsnIoPtr, AsnTypePtr));
+NLM_EXTERN Boolean LIBCALL RemoveOutsideActionAsnWrite PROTO (( RemoveOutsideActionPtr , AsnIoPtr, AsnTypePtr));
+
 typedef ValNodePtr ActionChoicePtr;
 typedef ValNode ActionChoice;
 #define ActionChoice_apply 1
@@ -1787,6 +1811,7 @@ typedef ValNode ActionChoice;
 #define ActionChoice_swap 5
 #define ActionChoice_remove 6
 #define ActionChoice_parse 7
+#define ActionChoice_remove_outside 8
 
 
 NLM_EXTERN ActionChoicePtr LIBCALL ActionChoiceFree PROTO ((ActionChoicePtr ));
@@ -2221,6 +2246,25 @@ NLM_EXTERN Boolean LIBCALL PartialBothSetActionAsnWrite PROTO (( PartialBothSetA
 #define Convert_location_type_order 2
 #define Convert_location_type_merge 3
 
+
+
+/**************************************************
+*
+*    ExtendToFeature
+*
+**************************************************/
+typedef struct struct_Extend_to_feature {
+   Uint2   type;
+   Uint1   include_feat;
+   ValNodePtr   distance;
+} ExtendToFeature, PNTR ExtendToFeaturePtr;
+
+
+NLM_EXTERN ExtendToFeaturePtr LIBCALL ExtendToFeatureFree PROTO ((ExtendToFeaturePtr ));
+NLM_EXTERN ExtendToFeaturePtr LIBCALL ExtendToFeatureNew PROTO (( void ));
+NLM_EXTERN ExtendToFeaturePtr LIBCALL ExtendToFeatureAsnRead PROTO (( AsnIoPtr, AsnTypePtr));
+NLM_EXTERN Boolean LIBCALL ExtendToFeatureAsnWrite PROTO (( ExtendToFeaturePtr , AsnIoPtr, AsnTypePtr));
+
 typedef ValNodePtr LocationEditTypePtr;
 typedef ValNode LocationEditType;
 #define LocationEditType_strand 1
@@ -2233,6 +2277,8 @@ typedef ValNode LocationEditType;
 #define LocationEditType_convert 8
 #define LocationEditType_extend_5 9
 #define LocationEditType_extend_3 10
+#define LocationEditType_extend_5_to_feat 11
+#define LocationEditType_extend_3_to_feat 12
 
 
 NLM_EXTERN LocationEditTypePtr LIBCALL LocationEditTypeFree PROTO ((LocationEditTypePtr ));
@@ -2250,6 +2296,7 @@ typedef struct struct_Edit_feature_location_action {
    Uint2   type;
    ValNodePtr   action;
    Uint1   retranslate_cds;
+   Uint1   also_edit_gene;
    ValNodePtr   constraint;
 } EditFeatureLocationAction, PNTR EditFeatureLocationActionPtr;
 
@@ -2314,6 +2361,11 @@ NLM_EXTERN Boolean LIBCALL RemoveDescriptorActionAsnWrite PROTO (( RemoveDescrip
 #define Autodef_list_type_feature_list 1
 #define Autodef_list_type_complete_sequence 2
 #define Autodef_list_type_complete_genome 3
+#define Autodef_list_type_sequence 4
+
+/* following #defines are for enumerated type, not used by object loaders */
+#define Autodef_misc_feat_parse_rule_use_comment_before_first_semicolon 1
+#define Autodef_misc_feat_parse_rule_look_for_noncoding_products 2
 
 
 
@@ -2325,6 +2377,7 @@ NLM_EXTERN Boolean LIBCALL RemoveDescriptorActionAsnWrite PROTO (( RemoveDescrip
 typedef struct struct_Autodef_action {
    ValNodePtr   modifiers;
    Uint2   clause_list_type;
+   Uint2   misc_feat_parse_rule;
 } AutodefAction, PNTR AutodefActionPtr;
 
 
@@ -2379,12 +2432,30 @@ NLM_EXTERN SortFieldsActionPtr LIBCALL SortFieldsActionNew PROTO (( void ));
 NLM_EXTERN SortFieldsActionPtr LIBCALL SortFieldsActionAsnRead PROTO (( AsnIoPtr, AsnTypePtr));
 NLM_EXTERN Boolean LIBCALL SortFieldsActionAsnWrite PROTO (( SortFieldsActionPtr , AsnIoPtr, AsnTypePtr));
 
+
+
+/**************************************************
+*
+*    FixAuthorCaps
+*
+**************************************************/
+typedef struct struct_Fix_author_caps {
+   Uint1   last_name_only;
+} FixAuthorCaps, PNTR FixAuthorCapsPtr;
+
+
+NLM_EXTERN FixAuthorCapsPtr LIBCALL FixAuthorCapsFree PROTO ((FixAuthorCapsPtr ));
+NLM_EXTERN FixAuthorCapsPtr LIBCALL FixAuthorCapsNew PROTO (( void ));
+NLM_EXTERN FixAuthorCapsPtr LIBCALL FixAuthorCapsAsnRead PROTO (( AsnIoPtr, AsnTypePtr));
+NLM_EXTERN Boolean LIBCALL FixAuthorCapsAsnWrite PROTO (( FixAuthorCapsPtr , AsnIoPtr, AsnTypePtr));
+
 typedef ValNodePtr FixCapsActionPtr;
 typedef ValNode FixCapsAction;
 #define FixCapsAction_pub 1
 #define FixCapsAction_src_country 2
 #define FixCapsAction_mouse_strain 3
 #define FixCapsAction_src_qual 4
+#define FixCapsAction_author 5
 
 
 NLM_EXTERN FixCapsActionPtr LIBCALL FixCapsActionFree PROTO ((FixCapsActionPtr ));
@@ -2521,6 +2592,196 @@ NLM_EXTERN AuthorFixActionPtr LIBCALL AuthorFixActionNew PROTO (( void ));
 NLM_EXTERN AuthorFixActionPtr LIBCALL AuthorFixActionAsnRead PROTO (( AsnIoPtr, AsnTypePtr));
 NLM_EXTERN Boolean LIBCALL AuthorFixActionAsnWrite PROTO (( AuthorFixActionPtr , AsnIoPtr, AsnTypePtr));
 
+
+
+/**************************************************
+*
+*    UpdateSequencesAction
+*
+**************************************************/
+typedef struct struct_Update_sequences_action {
+   CharPtr   filename;
+   Uint1   add_cit_subs;
+} UpdateSequencesAction, PNTR UpdateSequencesActionPtr;
+
+
+NLM_EXTERN UpdateSequencesActionPtr LIBCALL UpdateSequencesActionFree PROTO ((UpdateSequencesActionPtr ));
+NLM_EXTERN UpdateSequencesActionPtr LIBCALL UpdateSequencesActionNew PROTO (( void ));
+NLM_EXTERN UpdateSequencesActionPtr LIBCALL UpdateSequencesActionAsnRead PROTO (( AsnIoPtr, AsnTypePtr));
+NLM_EXTERN Boolean LIBCALL UpdateSequencesActionAsnWrite PROTO (( UpdateSequencesActionPtr , AsnIoPtr, AsnTypePtr));
+
+typedef ValNodePtr CreateTSAIdsSrcPtr;
+typedef ValNode CreateTSAIdsSrc;
+#define CreateTSAIdsSrc_local_id 1
+#define CreateTSAIdsSrc_defline 2
+
+
+NLM_EXTERN CreateTSAIdsSrcPtr LIBCALL CreateTSAIdsSrcFree PROTO ((CreateTSAIdsSrcPtr ));
+NLM_EXTERN CreateTSAIdsSrcPtr LIBCALL CreateTSAIdsSrcAsnRead PROTO (( AsnIoPtr, AsnTypePtr));
+NLM_EXTERN Boolean LIBCALL CreateTSAIdsSrcAsnWrite PROTO (( CreateTSAIdsSrcPtr , AsnIoPtr, AsnTypePtr));
+
+
+
+/**************************************************
+*
+*    CreateTSAIdsAction
+*
+**************************************************/
+typedef struct struct_Create_TSA_ids_action {
+   ValNodePtr   src;
+   CharPtr   suffix;
+   struct struct_Text_portion PNTR   id_text_portion;
+} CreateTSAIdsAction, PNTR CreateTSAIdsActionPtr;
+
+
+NLM_EXTERN CreateTSAIdsActionPtr LIBCALL CreateTSAIdsActionFree PROTO ((CreateTSAIdsActionPtr ));
+NLM_EXTERN CreateTSAIdsActionPtr LIBCALL CreateTSAIdsActionNew PROTO (( void ));
+NLM_EXTERN CreateTSAIdsActionPtr LIBCALL CreateTSAIdsActionAsnRead PROTO (( AsnIoPtr, AsnTypePtr));
+NLM_EXTERN Boolean LIBCALL CreateTSAIdsActionAsnWrite PROTO (( CreateTSAIdsActionPtr , AsnIoPtr, AsnTypePtr));
+
+
+
+/**************************************************
+*
+*    AutofixAction
+*
+**************************************************/
+typedef struct struct_Autofix_action {
+   CharPtr   test_name;
+} AutofixAction, PNTR AutofixActionPtr;
+
+
+NLM_EXTERN AutofixActionPtr LIBCALL AutofixActionFree PROTO ((AutofixActionPtr ));
+NLM_EXTERN AutofixActionPtr LIBCALL AutofixActionNew PROTO (( void ));
+NLM_EXTERN AutofixActionPtr LIBCALL AutofixActionAsnRead PROTO (( AsnIoPtr, AsnTypePtr));
+NLM_EXTERN Boolean LIBCALL AutofixActionAsnWrite PROTO (( AutofixActionPtr , AsnIoPtr, AsnTypePtr));
+
+typedef ValNodePtr FixSetsActionPtr;
+typedef ValNode FixSetsAction;
+#define FixSetsAction_remove_single_item_set 1
+#define FixSetsAction_renormalize_nuc_prot_sets 2
+#define FixSetsAction_fix_pop_to_phy 3
+
+
+NLM_EXTERN FixSetsActionPtr LIBCALL FixSetsActionFree PROTO ((FixSetsActionPtr ));
+NLM_EXTERN FixSetsActionPtr LIBCALL FixSetsActionAsnRead PROTO (( AsnIoPtr, AsnTypePtr));
+NLM_EXTERN Boolean LIBCALL FixSetsActionAsnWrite PROTO (( FixSetsActionPtr , AsnIoPtr, AsnTypePtr));
+
+typedef ValNodePtr TableMatchTypePtr;
+typedef ValNode TableMatchType;
+#define TableMatchType_feature_id 1
+#define TableMatchType_gene_locus_tag 2
+#define TableMatchType_protein_id 3
+#define TableMatchType_dbxref 4
+#define TableMatchType_nuc_id 5
+#define TableMatchType_src_qual 6
+#define TableMatchType_protein_name 7
+#define TableMatchType_any 8
+
+
+NLM_EXTERN TableMatchTypePtr LIBCALL TableMatchTypeFree PROTO ((TableMatchTypePtr ));
+NLM_EXTERN TableMatchTypePtr LIBCALL TableMatchTypeAsnRead PROTO (( AsnIoPtr, AsnTypePtr));
+NLM_EXTERN Boolean LIBCALL TableMatchTypeAsnWrite PROTO (( TableMatchTypePtr , AsnIoPtr, AsnTypePtr));
+
+
+
+/**************************************************
+*
+*    TableMatch
+*
+**************************************************/
+typedef struct struct_Table_match {
+   ValNodePtr   match_type;
+   Uint2   match_location;
+} TableMatch, PNTR TableMatchPtr;
+
+
+NLM_EXTERN TableMatchPtr LIBCALL TableMatchFree PROTO ((TableMatchPtr ));
+NLM_EXTERN TableMatchPtr LIBCALL TableMatchNew PROTO (( void ));
+NLM_EXTERN TableMatchPtr LIBCALL TableMatchAsnRead PROTO (( AsnIoPtr, AsnTypePtr));
+NLM_EXTERN Boolean LIBCALL TableMatchAsnWrite PROTO (( TableMatchPtr , AsnIoPtr, AsnTypePtr));
+
+typedef ValNodePtr ApplyTableExtraDataPtr;
+typedef ValNode ApplyTableExtraData;
+#define ApplyTableExtraData_table 1
+
+
+NLM_EXTERN ApplyTableExtraDataPtr LIBCALL ApplyTableExtraDataFree PROTO ((ApplyTableExtraDataPtr ));
+NLM_EXTERN ApplyTableExtraDataPtr LIBCALL ApplyTableExtraDataAsnRead PROTO (( AsnIoPtr, AsnTypePtr));
+NLM_EXTERN Boolean LIBCALL ApplyTableExtraDataAsnWrite PROTO (( ApplyTableExtraDataPtr , AsnIoPtr, AsnTypePtr));
+
+
+
+/**************************************************
+*
+*    ApplyTableAction
+*
+**************************************************/
+typedef struct struct_Apply_table_action {
+   CharPtr   filename;
+   struct struct_Table_match PNTR   match_type;
+   ValNodePtr   in_memory_table;
+} ApplyTableAction, PNTR ApplyTableActionPtr;
+
+
+NLM_EXTERN ApplyTableActionPtr LIBCALL ApplyTableActionFree PROTO ((ApplyTableActionPtr ));
+NLM_EXTERN ApplyTableActionPtr LIBCALL ApplyTableActionNew PROTO (( void ));
+NLM_EXTERN ApplyTableActionPtr LIBCALL ApplyTableActionAsnRead PROTO (( AsnIoPtr, AsnTypePtr));
+NLM_EXTERN Boolean LIBCALL ApplyTableActionAsnWrite PROTO (( ApplyTableActionPtr , AsnIoPtr, AsnTypePtr));
+
+
+
+/**************************************************
+*
+*    AddFileAction
+*
+**************************************************/
+typedef struct struct_Add_file_action {
+   CharPtr   filename;
+   ValNodePtr   in_memory_table;
+} AddFileAction, PNTR AddFileActionPtr;
+
+
+NLM_EXTERN AddFileActionPtr LIBCALL AddFileActionFree PROTO ((AddFileActionPtr ));
+NLM_EXTERN AddFileActionPtr LIBCALL AddFileActionNew PROTO (( void ));
+NLM_EXTERN AddFileActionPtr LIBCALL AddFileActionAsnRead PROTO (( AsnIoPtr, AsnTypePtr));
+NLM_EXTERN Boolean LIBCALL AddFileActionAsnWrite PROTO (( AddFileActionPtr , AsnIoPtr, AsnTypePtr));
+
+
+
+/**************************************************
+*
+*    AddDescriptorListAction
+*
+**************************************************/
+typedef struct struct_Add_descriptor_list_action {
+   struct struct_Add_file_action PNTR   descriptor_list;
+   ValNodePtr   constraint;
+} AddDescriptorListAction, PNTR AddDescriptorListActionPtr;
+
+
+NLM_EXTERN AddDescriptorListActionPtr LIBCALL AddDescriptorListActionFree PROTO ((AddDescriptorListActionPtr ));
+NLM_EXTERN AddDescriptorListActionPtr LIBCALL AddDescriptorListActionNew PROTO (( void ));
+NLM_EXTERN AddDescriptorListActionPtr LIBCALL AddDescriptorListActionAsnRead PROTO (( AsnIoPtr, AsnTypePtr));
+NLM_EXTERN Boolean LIBCALL AddDescriptorListActionAsnWrite PROTO (( AddDescriptorListActionPtr , AsnIoPtr, AsnTypePtr));
+
+
+
+/**************************************************
+*
+*    RemoveSequencesAction
+*
+**************************************************/
+typedef struct struct_Remove_sequences_action {
+   ValNodePtr   constraint;
+} RemoveSequencesAction, PNTR RemoveSequencesActionPtr;
+
+
+NLM_EXTERN RemoveSequencesActionPtr LIBCALL RemoveSequencesActionFree PROTO ((RemoveSequencesActionPtr ));
+NLM_EXTERN RemoveSequencesActionPtr LIBCALL RemoveSequencesActionNew PROTO (( void ));
+NLM_EXTERN RemoveSequencesActionPtr LIBCALL RemoveSequencesActionAsnRead PROTO (( AsnIoPtr, AsnTypePtr));
+NLM_EXTERN Boolean LIBCALL RemoveSequencesActionAsnWrite PROTO (( RemoveSequencesActionPtr , AsnIoPtr, AsnTypePtr));
+
 typedef ValNodePtr MacroActionChoicePtr;
 typedef ValNode MacroActionChoice;
 #define MacroActionChoice_aecr 1
@@ -2550,6 +2811,18 @@ typedef ValNode MacroActionChoice;
 #define MacroActionChoice_make_gene_xrefs 25
 #define MacroActionChoice_make_bold_xrefs 26
 #define MacroActionChoice_fix_author 27
+#define MacroActionChoice_update_sequences 28
+#define MacroActionChoice_add_trans_splicing 29
+#define MacroActionChoice_remove_invalid_ecnumbers 30
+#define MacroActionChoice_create_tsa_ids 31
+#define MacroActionChoice_perform_autofix 32
+#define MacroActionChoice_fix_sets 33
+#define MacroActionChoice_apply_table 34
+#define MacroActionChoice_remove_sequences 35
+#define MacroActionChoice_propagate_sequence_technology 36
+#define MacroActionChoice_add_file_descriptors 37
+#define MacroActionChoice_propagate_missing_old_name 38
+#define MacroActionChoice_autoapply_structured_comments 39
 
 
 NLM_EXTERN MacroActionChoicePtr LIBCALL MacroActionChoiceFree PROTO ((MacroActionChoicePtr ));
@@ -2624,18 +2897,19 @@ NLM_EXTERN Boolean LIBCALL ReplaceRuleAsnWrite PROTO (( ReplaceRulePtr , AsnIoPt
 /* following #defines are for enumerated type, not used by object loaders */
 #define Fix_type_none 0
 #define Fix_type_typo 1
-#define Fix_type_quickfix 2
-#define Fix_type_no_organelle_for_prokaryote 3
-#define Fix_type_might_be_nonfunctional 4
-#define Fix_type_database 5
-#define Fix_type_remove_organism_name 6
-#define Fix_type_inappropriate_symbol 7
-#define Fix_type_evolutionary_relationship 8
-#define Fix_type_use_protein 9
-#define Fix_type_hypothetical 10
-#define Fix_type_british 11
-#define Fix_type_description 12
-#define Fix_type_gene 13
+#define Fix_type_putative_typo 2
+#define Fix_type_quickfix 3
+#define Fix_type_no_organelle_for_prokaryote 4
+#define Fix_type_might_be_nonfunctional 5
+#define Fix_type_database 6
+#define Fix_type_remove_organism_name 7
+#define Fix_type_inappropriate_symbol 8
+#define Fix_type_evolutionary_relationship 9
+#define Fix_type_use_protein 10
+#define Fix_type_hypothetical 11
+#define Fix_type_british 12
+#define Fix_type_description 13
+#define Fix_type_gene 14
 
 
 
@@ -2651,6 +2925,7 @@ typedef struct struct_Suspect_rule {
    ValNodePtr   feat_constraint;
    Uint2   rule_type;
    struct struct_Replace_rule PNTR   replace;
+   CharPtr   description;
 } SuspectRule, PNTR SuspectRulePtr;
 
 
diff --git a/object/objseq.c b/object/objseq.c
index dee6ecec..e787a69d 100644
--- a/object/objseq.c
+++ b/object/objseq.c
@@ -29,7 +29,7 @@
 *   
 * Version Creation Date: 4/1/91
 *
-* $Revision: 6.37 $
+* $Revision: 6.39 $
 *
 * File Description:  Object manager for module NCBI-Seq
 *
@@ -1000,7 +1000,8 @@ NLM_EXTERN BioseqPtr LIBCALL BioseqAsnRead (AsnIoPtr aip, AsnTypePtr orig)
     if (atp == BIOSEQ_annot)
     {
         bsp->annot = SeqAnnotSetAsnRead(aip, atp, BIOSEQ_annot_E);
-        if (bsp->annot == NULL) goto erret;
+// 15dec2011: do not treat empty set as error
+//        if (bsp->annot == NULL) goto erret;
         atp = AsnReadId(aip, amp, atp); if (atp == NULL) goto erret;
     }
 
@@ -1557,6 +1558,156 @@ erret:
 
 /**************************************************
 *
+*    LinkageEvidenceNew()
+*
+**************************************************/
+NLM_EXTERN 
+LinkageEvidencePtr LIBCALL
+LinkageEvidenceNew(void)
+{
+   LinkageEvidencePtr ptr = MemNew((size_t) sizeof(LinkageEvidence));
+
+   return ptr;
+
+}
+
+
+/**************************************************
+*
+*    LinkageEvidenceFree()
+*
+**************************************************/
+NLM_EXTERN 
+LinkageEvidencePtr LIBCALL
+LinkageEvidenceFree(LinkageEvidencePtr ptr)
+{
+
+   if(ptr == NULL) {
+      return NULL;
+   }
+   return MemFree(ptr);
+}
+
+
+/**************************************************
+*
+*    LinkageEvidenceAsnRead()
+*
+**************************************************/
+NLM_EXTERN 
+LinkageEvidencePtr LIBCALL
+LinkageEvidenceAsnRead(AsnIoPtr aip, AsnTypePtr orig)
+{
+   DataVal av;
+   AsnTypePtr atp;
+   AsnReadFunc func;
+   LinkageEvidencePtr ptr;
+
+   if (! loaded)
+   {
+      if (! SeqAsnLoad()) {
+         return NULL;
+      }
+   }
+
+   if (aip == NULL) {
+      return NULL;
+   }
+
+   if (orig == NULL) {         /* LinkageEvidence ::= (self contained) */
+      atp = AsnReadId(aip, amp, LINKAGE_EVIDENCE);
+   } else {
+      atp = AsnLinkType(orig, LINKAGE_EVIDENCE);
+   }
+   /* link in local tree */
+   if (atp == NULL) {
+      return NULL;
+   }
+
+   ptr = LinkageEvidenceNew();
+   if (ptr == NULL) {
+      goto erret;
+   }
+   if (AsnReadVal(aip, atp, &av) <= 0) { /* read the start struct */
+      goto erret;
+   }
+
+   atp = AsnReadId(aip,amp, atp);
+   func = NULL;
+
+   if (atp == LINKAGE_EVIDENCE_type) {
+      if ( AsnReadVal(aip, atp, &av) <= 0) {
+         goto erret;
+      }
+      ptr -> type = av.intvalue;
+      atp = AsnReadId(aip,amp, atp);
+   }
+
+   if (AsnReadVal(aip, atp, &av) <= 0) {
+      goto erret;
+   }
+   /* end struct */
+
+ret:
+   AsnUnlinkType(orig);       /* unlink local tree */
+   return ptr;
+
+erret:
+   aip -> io_failure = TRUE;
+   ptr = LinkageEvidenceFree(ptr);
+   goto ret;
+}
+
+
+
+/**************************************************
+*
+*    LinkageEvidenceAsnWrite()
+*
+**************************************************/
+NLM_EXTERN Boolean LIBCALL 
+LinkageEvidenceAsnWrite(LinkageEvidencePtr ptr, AsnIoPtr aip, AsnTypePtr orig)
+{
+   DataVal av;
+   AsnTypePtr atp;
+   Boolean retval = FALSE;
+
+   if (! loaded)
+   {
+      if (! SeqAsnLoad()) {
+         return FALSE;
+      }
+   }
+
+   if (aip == NULL) {
+      return FALSE;
+   }
+
+   atp = AsnLinkType(orig, LINKAGE_EVIDENCE);   /* link local tree */
+   if (atp == NULL) {
+      return FALSE;
+   }
+
+   if (ptr == NULL) { AsnNullValueMsg(aip, atp); goto erret; }
+   if (! AsnOpenStruct(aip, atp, (Pointer) ptr)) {
+      goto erret;
+   }
+
+   av.intvalue = ptr -> type;
+   retval = AsnWrite(aip, LINKAGE_EVIDENCE_type,  &av);
+   if (! AsnCloseStruct(aip, atp, (Pointer)ptr)) {
+      goto erret;
+   }
+   retval = TRUE;
+
+erret:
+   AsnUnlinkType(orig);       /* unlink local tree */
+   return retval;
+}
+
+
+/**************************************************
+*
 *    SeqGapNew()
 *
 **************************************************/
@@ -1584,6 +1735,7 @@ SeqGapFree(SeqGapPtr ptr)
    if(ptr == NULL) {
       return NULL;
    }
+   AsnGenericValNodeSetFree(ptr -> linkage_evidence, (AsnOptFreeFunc) LinkageEvidenceFree);
    return MemFree(ptr);
 }
 
@@ -1599,6 +1751,7 @@ SeqGapAsnRead(AsnIoPtr aip, AsnTypePtr orig)
 {
    DataVal av;
    AsnTypePtr atp;
+   Boolean isError = FALSE;
    AsnReadFunc func;
    SeqGapPtr ptr;
 
@@ -1648,6 +1801,13 @@ SeqGapAsnRead(AsnIoPtr aip, AsnTypePtr orig)
       ptr -> linkage = av.intvalue;
       atp = AsnReadId(aip,amp, atp);
    }
+   if (atp == SEQ_GAP_linkage_evidence) {
+      ptr -> linkage_evidence = AsnGenericValNodeSetAsnRead(aip, amp, atp, &isError, (AsnReadFunc) LinkageEvidenceAsnRead, (AsnOptFreeFunc) LinkageEvidenceFree);
+      if (isError && ptr -> linkage_evidence == NULL) {
+         goto erret;
+      }
+      atp = AsnReadId(aip,amp, atp);
+   }
 
    if (AsnReadVal(aip, atp, &av) <= 0) {
       goto erret;
@@ -1703,6 +1863,9 @@ SeqGapAsnWrite(SeqGapPtr ptr, AsnIoPtr aip, AsnTypePtr orig)
    retval = AsnWrite(aip, SEQ_GAP_type,  &av);
    av.intvalue = ptr -> linkage;
    retval = AsnWrite(aip, SEQ_GAP_linkage,  &av);
+   if (ptr -> linkage_evidence != NULL) {
+      AsnGenericValNodeSetAsnWrite(ptr -> linkage_evidence, (AsnWriteFunc) LinkageEvidenceAsnWrite, aip, SEQ_GAP_linkage_evidence, SEQ_GAP_linkage_evidence_E);
+   }
    if (! AsnCloseStruct(aip, atp, (Pointer)ptr)) {
       goto erret;
    }
diff --git a/object/objseq.h b/object/objseq.h
index e0c443be..e756a04a 100644
--- a/object/objseq.h
+++ b/object/objseq.h
@@ -29,7 +29,7 @@
 *   
 * Version Creation Date: 4/1/91
 *
-* $Revision: 6.11 $
+* $Revision: 6.12 $
 *
 * File Description:  Object manager interface for module NCBI-Seq
 *
@@ -284,12 +284,29 @@ NLM_EXTERN SeqHistPtr LIBCALL SeqHistFree PROTO((SeqHistPtr shp));
 
 /**************************************************
 *
+*    LinkageEvidence
+*
+**************************************************/
+typedef struct struct_Linkage_evidence {
+   struct struct_Linkage_evidence PNTR next;
+   Int4   type;
+} LinkageEvidence, PNTR LinkageEvidencePtr;
+
+
+NLM_EXTERN LinkageEvidencePtr LIBCALL LinkageEvidenceFree PROTO ((LinkageEvidencePtr ));
+NLM_EXTERN LinkageEvidencePtr LIBCALL LinkageEvidenceNew PROTO (( void ));
+NLM_EXTERN LinkageEvidencePtr LIBCALL LinkageEvidenceAsnRead PROTO (( AsnIoPtr, AsnTypePtr));
+NLM_EXTERN Boolean LIBCALL LinkageEvidenceAsnWrite PROTO (( LinkageEvidencePtr , AsnIoPtr, AsnTypePtr));
+
+/**************************************************
+*
 *    SeqGap
 *
 **************************************************/
 typedef struct struct_Seq_gap {
-   Int4   type;
-   Int4   linkage;
+   Int4        type;
+   Int4        linkage;
+   ValNodePtr  linkage_evidence;
 } SeqGap, PNTR SeqGapPtr;
 
 
diff --git a/object/objvalid.c b/object/objvalid.c
index 8428a510..378fac82 100644
--- a/object/objvalid.c
+++ b/object/objvalid.c
@@ -31,7 +31,7 @@ objvalidAsnLoad(void)
 
 /**************************************************
 *    Generated object loaders for Module NCBI-Structured-comment-validation
-*    Generated using ASNCODE Revision: 6.16 at Dec 11, 2009  7:16 AM
+*    Generated using ASNCODE Revision: 6.17 at Feb 22, 2012 10:57 AM
 *
 **************************************************/
 
@@ -348,6 +348,7 @@ DependentFieldRuleNew(void)
 {
    DependentFieldRulePtr ptr = MemNew((size_t) sizeof(DependentFieldRule));
 
+   ptr -> invert_match = 0;
    return ptr;
 
 }
@@ -435,6 +436,13 @@ DependentFieldRuleAsnRead(AsnIoPtr aip, AsnTypePtr orig)
       ptr -> value_constraint = av.ptrvalue;
       atp = AsnReadId(aip,amp, atp);
    }
+   if (atp == FIELD_RULE_invert_match) {
+      if ( AsnReadVal(aip, atp, &av) <= 0) {
+         goto erret;
+      }
+      ptr -> invert_match = av.boolvalue;
+      atp = AsnReadId(aip,amp, atp);
+   }
    if (atp == FIELD_RULE_other_fields) {
       ptr -> other_fields = FieldSetAsnRead(aip, atp);
       if (aip -> io_failure) {
@@ -508,6 +516,8 @@ DependentFieldRuleAsnWrite(DependentFieldRulePtr ptr, AsnIoPtr aip, AsnTypePtr o
       av.ptrvalue = ptr -> value_constraint;
       retval = AsnWrite(aip, FIELD_RULE_value_constraint,  &av);
    }
+   av.boolvalue = ptr -> invert_match;
+   retval = AsnWrite(aip, FIELD_RULE_invert_match,  &av);
    if (ptr -> other_fields != NULL) {
       if ( ! FieldSetAsnWrite(ptr -> other_fields, aip, FIELD_RULE_other_fields)) {
          goto erret;
diff --git a/object/objvalid.h b/object/objvalid.h
index d8160b9b..547d04cb 100644
--- a/object/objvalid.h
+++ b/object/objvalid.h
@@ -17,7 +17,7 @@ extern "C" { /* } */
 /**************************************************
 *
 *    Generated objects for Module NCBI-Structured-comment-validation
-*    Generated using ASNCODE Revision: 6.16 at Dec 11, 2009  7:16 AM
+*    Generated using ASNCODE Revision: 6.17 at Feb 22, 2012 10:57 AM
 *
 **************************************************/
 
@@ -83,6 +83,7 @@ typedef struct struct_Dependent_field_rule {
    struct struct_Dependent_field_rule PNTR next;
    CharPtr   match_name;
    CharPtr   value_constraint;
+   Uint1   invert_match;
    struct struct_Field_rule PNTR   other_fields;
    struct struct_Field_rule PNTR   disallowed_fields;
 } DependentFieldRule, PNTR DependentFieldRulePtr;