a1c329068ad18aa4093972b501e6324f8bcdb398
angie
  Fri Sep 16 17:19:30 2016 -0700
Parse HGVS position ranges and coding terms' UTR and intron coordinates.
When the chromAlias table is present, this also now supports NC_*:g. terms.
The sequence change part is no longer parsed -- it's not necessary for mapping
to genomic ranges, although it will be necessary in order for hgVai to take
HGVS input.
This does not yet support ranges-of-ranges but neither does Mutalyzer.  This
also doesn't support uncertain positions ('?').  Like complex sequence changes,
those can wait until we have a sophisticated parser.
We also support some new not-quite-HGVS forms: geneSymbol and protein pos only,
or geneSymbol and c.<valid position range>.
refs #15071

diff --git src/hg/inc/hgHgvs.h src/hg/inc/hgHgvs.h
index 2b461f4..7b2fada 100644
--- src/hg/inc/hgHgvs.h
+++ src/hg/inc/hgHgvs.h
@@ -1,74 +1,79 @@
 /* hgHgvs - support for a subset of the Human Genome Variation Society's (HGVS) nomenclature
  * for describing variants with respect to a specific gene sequence (or genome assembly).
  * See http://www.hgvs.org/mutnomen/ */
 
 /* Copyright (C) 2016 The Regents of the University of California
  * See README in this or parent directory for licensing information. */
 
 #ifndef HGHGVS_H
 #define HGHGVS_H
 
-#include "psl.h"
+#include "basicBed.h"
 
 /* The full nomenclature is extremely complicated, able to encode things such as gene fusions and
  * advanced clinical info (e.g. "=/" for somatic mosaicism, "=//" for chimerism).  I am starting
  * simple with single-base substitutions, which should cover the majority of use cases, and will
  * work up from there.
  *
  * At the same time, since the spec has repeatedly changed, we will need to be flexible in our
  * parsing in order to support previously published HGVS (or HGVS-like) terms. */
 
-enum hgvsTermType
+enum hgvsSeqType
 /* HGVS describes changes relative to several types of sequence: genomic, coding, protein, etc */
     {
     hgvstUndefined,  // the usual int default value means we haven't actually checked
     hgvstCoding,     // "c.": Coding DNA sequence only. Beware: complex coords for intron & UTR.
     hgvstGenomic,    // "g.": Genomic DNA
     hgvstMito,       // "m.": Mitochondrial DNA
     hgvstNoncoding,  // "n.": non-coding RNA
     hgvstRna,        // "r.": RNA (like DNA but lowercase and 'u' instead of 'T')
     hgvstProtein,    // "p.": Protein
     };
 
 struct hgvsVariant
 /* Components that we are able parse out of an HGVS term. (there's more to HGVS than just this) */
     {
     struct hgvsVariant *next;
     char *seqAcc;            // The reference sequence for the variant (optional -- may be NULL!)
     char *seqGeneSymbol;     // Usually NULL, but DNA/RNA can have HGNC gene symbol in ()'s.
-    char *changeSymbol;      // ">" for subst; "ins", "del", "delins", "inv", "con", "=", ...
-    char *refAllele;         // Reference allele base (poss. NULL, not given for multi-base changes)
-    char *altAllele;         // Alternate allele base (poss. NULL, not always given)
+    char *change;            // The sequence change (following the position in nucleotide terms,
+                             // with embedded position in protein terms); currently not parsed.
     int start1;              // 1-based start of the variant in reference seq: can be negative !
-    int end;                 // end of the variant in the reference seq; can be negative !
-    enum hgvsTermType type;  // type of sequence: genomic, coding, protein, etc
-    // The following fields apply only to hgvstCoding ("c.") terms:
-    int intronStart1;        // 1-based, 0 means N/A; can be negative!
-    int intronEnd;           // 0 means N/A; can be negative!
+                             // For coding terms with complex intron or UTR coords, this is the
+                             // anchor coord (nearest CDS exon boundary)
+    int end;                 // End of the variant in the reference seq; can be negative !
+                             // For a range, this is the second anchor coord; else same as start
+    // These two fields apply only to hgvstCoding ("c.") terms and Rna ("r.") for coding RNAs:
+    int startOffset;         // offset into intron; 1-based, 0 means N/A; can be negative!
+    int endOffset;           // offset into intron; 0 means N/A; can be negative!
+                             // For a range, this is the second offset; else same as startOffset
+    enum hgvsSeqType type;   // type of sequence: genomic, coding, protein, etc
     boolean startIsUtr3;     // TRUE if start is relative to *end* of coding sequence
     boolean endIsUtr3;       // TRUE if end is relative to *end* of coding sequence
     };
 
 struct hgvsVariant *hgvsParseTerm(char *term);
 /* If term is a parseable form of HGVS, return the parsed representation, otherwise NULL.
  * This does not check validity of accessions or alleles. */
 
 struct hgvsVariant *hgvsParsePseudoHgvs(char *db, char *term);
 /* Attempt to parse things that are not strict HGVS, but that people might intend as HGVS. */
 
 boolean hgvsValidate(char *db, struct hgvsVariant *hgvs, char **retFoundAcc, int *retFoundVersion,
                      char **retDiffRefAllele);
 /* Return TRUE if hgvs coords are within the bounds of the sequence for hgvs->seqAcc.
+ * Note: Coding terms may contain coords outside the bounds (upstream, intron, downstream) so
+ * those can't be checked without mapping the term to the genome; this returns TRUE if seq is found.
  * If retFoundAcc is not NULL, set it to our local accession (which may be missing the .version
  * of hgvs->seqAcc) or NULL if we can't find any match.
  * If retFoundVersion is not NULL and hgvs->seqAcc has a version number (e.g. NM_005957.4),
  * set retFoundVersion to our version from latest GenBank, otherwise 0 (no version for LRG).
  * If coords are OK and retDiffRefAllele is not NULL: if our sequence at the coords
  * matches hgvs->refAllele then set it to NULL; if mismatch then set it to our sequence. */
 
-struct psl *hgvsMapToGenome(char *db, struct hgvsVariant *hgvs, char **retPslTable);
+struct bed3 *hgvsMapToGenome(char *db, struct hgvsVariant *hgvs, char **retPslTable);
 /* Return a psl with target coords from db, mapping the variant to the genome.
  * Return NULL if unable to map.
  * If successful and retPslTable is not NULL, set it to the name of the PSL table used. */
 
 #endif /* HGHGVS_H */