f5ba7e5371b8bcf6c260d065b971e57c09eca1ad
Merge parents 189bd07 d24ed48
kate
  Wed Sep 25 10:56:06 2019 -0700
Merging

diff --cc src/hg/hgTracks/hgTracks.h
index a00c231,8e0421b..f32e1c8
--- src/hg/hgTracks/hgTracks.h
+++ src/hg/hgTracks/hgTracks.h
@@@ -1362,30 -1367,33 +1367,33 @@@
  boolean isCenterLabelConditional(struct track *track);
  /* Dense subtracks and pack subtracks (when centerLabelsPack off set)
   *      show center labels depending on vis of previous track */
  
  boolean isCenterLabelConditionallySeen(struct track *track);
  /* Returns FALSE if track and prevTrack have same parent, and are both conditional
   * i.e. dense subtrack or pack subtrack with centerLabelsPack off set
   */
  
  boolean isCenterLabelsPackOff(struct track *track);
  /* Check for trackDb setting to suppress center labels of composite in pack mode */
  
  boolean isCenterLabelIncluded(struct track *track);
  /* Center labels may be conditionally included */
  
 -boolean doCollapseEmptySubtracks(struct track *track);
++boolean doHideEmptySubtracks(struct track *track, char **multiBedFile, char **subtrackIdFile);
+ /* Suppress display of empty subtracks. Initial support only for bed's. */
+ 
  Color maybeDarkerLabels(struct track *track, struct hvGfx *hvg, Color color);
  /* For tracks having light track display but needing a darker label */
  
  void affyTxnPhase2Methods(struct track *track);
  /* Methods for dealing with a composite transcriptome tracks. */
  
  void loadGenePred(struct track *tg);
  /* Convert gene pred in window to linked feature. */
  
  void genePredAssignConfiguredName(struct track *tg);
  /* Set name on genePred in "extra" field to gene name, accession, or both,
   * depending, on UI on all items in track */
  
  void loadGenePredWithConfiguredName(struct track *tg);
  /* Convert gene pred info in window to linked feature. Include name