Fix typos and some cleanup.

Author: garretrieger

ift/encoder/activation_condition.h

@@ -110,9 +110,9 @@ class ActivationCondition {
   // Returns true if any of the condition groups intersects with 'segments'.
   bool Intersects(const common::SegmentSet& segments) const;
 
-  // Generate a new condition which is a copy of this one but will all
+  // Generate a new condition which is a copy of this one but with all
   // occurences of 'segments' replaced with base_segment. New condition will be
-  // simplified to removed any resulting redundancy.
+  // simplified to remove any resulting redundancy.
   ActivationCondition ReplaceSegments(segment_index_t base_segment,
                                       const common::SegmentSet& segments) const;
 

ift/encoder/dependency_closure.cc

@@ -89,7 +89,7 @@ Status DependencyClosure::SegmentsMerged(segment_index_t base_segment,
 Status DependencyClosure::InitNodeConditionsCache() {
   node_conditions_with_segment_.clear();
   glyph_condition_cache_.clear();
-  node_condition_cache_ = TRY(ExtractAllGlyphConditions());
+  node_condition_cache_ = TRY(ExtractAllNodeConditions());
   for (const auto& [n, condition] : node_condition_cache_) {
     for (segment_index_t s : condition.TriggeringSegments()) {
       node_conditions_with_segment_[s].insert(n);
@@ -504,7 +504,7 @@ Status DependencyClosure::PropagateConditions(
 }
 
 StatusOr<flat_hash_map<Node, ActivationCondition>>
-DependencyClosure::ExtractAllGlyphConditions() const {
+DependencyClosure::ExtractAllNodeConditions() const {
   auto conditions = InitializeConditions();
 
   flat_hash_set<hb_tag_t> table_tags =

ift/encoder/dependency_closure.h

@@ -96,7 +96,7 @@ class DependencyClosure {
 #endif
 
   // This structure caches information derived from the segmentation info
-  // segments. These two function signals that segmentation info segments have
+  // segments. These two function signal that segmentation info segments have
   // changed and recomputes the internal cached information.
   absl::Status InitFontChanged(const ift::common::SegmentSet& segments);
   absl::Status SegmentsMerged(segment_index_t base_segment,
@@ -111,8 +111,6 @@ class DependencyClosure {
   //
   // Utilizes the dependency graph to make the determination, so it's possible
   // that the result may be overestimated.
-  //
-  // TODO XXXX can drop StatusOr<> from these.
   absl::StatusOr<ift::common::SegmentSet> SegmentsThatInteractWith(
       const common::GlyphSet& glyphs) const;
   absl::StatusOr<ift::common::SegmentSet> SegmentsThatInteractWith(
@@ -129,10 +127,10 @@ class DependencyClosure {
 #ifdef HB_DEPEND_API
 
   // Extracts the full activations conditions (as specified by the dependency
-  // graph) for all glyphs. In some cases may overestimate activation conditions
+  // graph) for all graph nodes. In some cases may overestimate activation conditions
   // versus real subsetting closure due to reliance on the dependency graph.
   absl::StatusOr<absl::flat_hash_map<dep_graph::Node, ActivationCondition>>
-  ExtractAllGlyphConditions() const;
+  ExtractAllNodeConditions() const;
 
   absl::flat_hash_map<dep_graph::Node, ActivationCondition>
   InitializeConditions() const;

ift/encoder/dependency_closure_disabled.cc

@@ -19,29 +19,29 @@ Status DependencyClosure::SegmentsMerged(segment_index_t base_segment,
                                          const SegmentSet& segments) {
   return absl::UnimplementedError(
       "Dependency graph functionality was disabled during compilation and is "
-      "unvailable");
+      "unavailable");
 }
 
 StatusOr<DependencyClosure::AnalysisAccuracy> DependencyClosure::AnalyzeSegment(
     const SegmentSet& segments, GlyphSet& and_gids, GlyphSet& or_gids,
     GlyphSet& exclusive_gids) {
   return absl::UnimplementedError(
-      "Depdency graph functionality was disabled during compilation and is "
-      "unvailable");
+      "Dependency graph functionality was disabled during compilation and is "
+      "unavailable");
 }
 
 StatusOr<SegmentSet> DependencyClosure::SegmentsThatInteractWith(
     const GlyphSet& glyphs) const {
   return absl::UnimplementedError(
-      "Depdency graph functionality was disabled during compilation and is "
-      "unvailable");
+      "Dependency graph functionality was disabled during compilation and is "
+      "unavailable");
 }
 
 StatusOr<SegmentSet> DependencyClosure::SegmentsThatInteractWith(
     const SubsetDefinition& def) const {
   return absl::UnimplementedError(
-      "Depdency graph functionality was disabled during compilation and is "
-      "unvailable");
+      "Dependency graph functionality was disabled during compilation and is "
+      "unavailable");
 }
 
 }  // namespace ift::encoder